RRRRHHHH_Code

Explore

Commits

Diff Revisions 8012b0 ... vs 076d76 ... for ruralHouses/src/dataAccess/DB4oManager.java

		@@ -470,14 +470,19 @@
470	470		null);
471	471		try {
472	472		ObjectSet<RuralHouse> result = db.queryByExample(house);
	473	+	Owner own = new Owner(rh.getOwner().getName(),rh.getOwner().getBankAccount(),rh.getOwner().getMailAccount());
	474	+	Owner ow = (Owner) db.queryByExample(own).get(0);
	475	+	rh.setOwner(ow);
473	476		if (result.isEmpty()) {
474		-	Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
475		-	rh.setOwner(ow);
476	477		ow.addRuralHouse(rh);
477	478		db.store(rh);
478	479		db.commit();
479	480		stored = true;
480	481		} else {
	482	+	ow.getRuralHouses().remove(result.get(0));
	483	+	result.get(0).setOwner(null);
	484	+	ow.addRuralHouse(rh);
	485	+	db.store(result.get(0));
481	486		db.delete(result.get(0));
482	487		db.store(rh);
483	488		db.commit();
		@@ -641,9 +646,9 @@
641	646
642	647		try {
643	648		Offer of = (Offer) db.queryByExample(
644		-	new Offer(o.getOfferNumber(), new RuralHouse(o
	649	+	new Offer(0, new RuralHouse(o
645	650		.getRuralHouse().getHouseName(), null, null, null,
646		-	null), null, null, 0)).get(0);
	651	+	null), o.getFirstDay(), o.getLastDay(), 0)).get(0);
647	652		Booking proto = new Booking(0, of, null, null);
648	653		ObjectSet<Booking> result = db.queryByExample(proto);
649	654		return new Vector<Booking>(result);