Started creating the booking interface for the owners.

[RRRRHHHH_Code] / ruralHouses / src / dataAccess / DB4oManager.java

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 6b4dd25..c594b1c 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -81,6 +81,7 @@ public class DB4oManager {
                configuration.common().activationDepth(c.getActivationDepth());
                configuration.common().updateDepth(c.getUpdateDepth());
                configuration.common().objectClass(Owner.class).cascadeOnUpdate(true);
+               configuration.common().objectClass(Owner.class).cascadeOnDelete(true);
                configuration.common().objectClass(RuralHouse.class).cascadeOnUpdate(true);
                configuration.common().objectClass(Account.class).cascadeOnUpdate(true);
                db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
@@ -128,14 +129,12 @@ public class DB4oManager {
                        
                        alfredo.addRuralHouse("Murgoitz", "", "Cedro", 6, 6, 6, 6, 6);
                        alfredo.setBankAccount("4144 0087 23 9700002133");
-                       Account jonAcc = new Account("userJon", "passJon", jon);
+                       Account jonAcc = new Account("1", "1", jon);
                        Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
                                        alfredo);
 
                        Account admin = new Account("admin","admin", true);
                        db.store(Administrator.giveAdmin());
-                       db.store(jon);
-                       db.store(alfredo);
                        db.store(jonAcc);
                        db.store(alfredoAcc);
                        db.store(admin);
@@ -464,12 +463,9 @@ public class DB4oManager {
                        ObjectSet<RuralHouse> result = db.queryByExample(house);
                        if (result.isEmpty()) {
                                Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
-                               ObjectSet<RuralHouse> orh = db.queryByExample(new RuralHouse(null, ow, null, null, null));
+                               rh.setOwner(ow);
                                ow.addRuralHouse(rh);
-                               for (RuralHouse aa: orh){
-                                       aa.setOwner(ow);
-                               }
-                               db.store(ow);
+                               db.store(rh);
                                db.commit();
                                stored = true;
                        } else {