X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/blobdiff_plain/4bc36b7ddf2a9626f60c551cf999ec24052087cc..85d983a413115168906ba44fa7b17c5781e418e7:/ruralHouses/src/dataAccess/DB4oManager.java

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 0f17aeb..a677c95 100644
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -85,8 +85,7 @@ public class DB4oManager {
 		configuration.common().objectClass(Booking.class).cascadeOnDelete(true);
 		configuration.common().objectClass(RuralHouse.class)
 				.cascadeOnDelete(true);
-		configuration.common().objectClass(Account.class)
-		.cascadeOnDelete(true);
+		configuration.common().objectClass(Account.class).cascadeOnDelete(true);
 		configuration.common().objectClass(Offer.class).cascadeOnDelete(true);
 		configuration.common().objectClass(Account.class).cascadeOnUpdate(true);
 		db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
@@ -222,14 +221,15 @@ public class DB4oManager {
 		}
 	}
 
-	public Vector<Offer> getRHsOffer(String name){
+	public Vector<Offer> getRHsOffer(String name) {
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
 
 		try {
-			RuralHouse rh = (RuralHouse)db.queryByExample(new RuralHouse(name, null, null, null, null)).get(0);
+			RuralHouse rh = (RuralHouse) db.queryByExample(
+					new RuralHouse(name, null, null, null, null)).get(0);
 			Offer proto = new Offer(0, rh, null, null, 0);
 			ObjectSet<Offer> result = db.queryByExample(proto);
 			return new Vector<Offer>(result);
@@ -237,8 +237,8 @@ public class DB4oManager {
 			db.close();
 		}
 	}
-	
-	public Administrator getAdminData(){
+
+	public Administrator getAdminData() {
 
 		if (c.isDatabaseLocal() == false)
 			openSDB();
@@ -374,7 +374,6 @@ public class DB4oManager {
 		}
 	}
 
-	
 	public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
 			Exception {
 
@@ -511,8 +510,8 @@ public class DB4oManager {
 
 	}
 
-	public Vector<RuralHouse> getRuralHouses(Owner ow, String name, String town,
-			int nBed, int nKit, int nBath, int nPark, int nLiv) {
+	public Vector<RuralHouse> getRuralHouses(Owner ow, String name,
+			String town, int nBed, int nKit, int nBath, int nPark, int nLiv) {
 		HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
 		RuralHouse rh = new RuralHouse(name, ow, null, town, fea);
 		if (c.isDatabaseLocal() == false)
@@ -607,10 +606,15 @@ public class DB4oManager {
 		else
 			openDB();
 		try {
-			ObjectSet<Booking> result = db.queryByExample(b);
-			result.get(0).getOffer().getBookings().remove(b);
-			db.store(result.get(0).getOffer());
-			db.delete(result.get(0));
+			Booking book = new Booking(b.getBookNumber(), new Offer(b
+					.getOffer().getOfferNumber(), new RuralHouse(b.getOffer()
+					.getRuralHouse().getHouseName(), null, null, null, null),
+					null, null, 0), b.getClient(), b.getBookDate());
+
+			ObjectSet<Booking> result = db.queryByExample(book);
+			Offer of = result.get(0).getOffer();
+			of.getBookings().remove(result.get(0));
+			db.store(of);
 			db.commit();
 		} catch (Exception e) {
 			e.printStackTrace();