debugging

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 03601e1..6b4dd25 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -80,7 +80,9 @@ public class DB4oManager {
                configuration = Db4oEmbedded.newConfiguration();
                configuration.common().activationDepth(c.getActivationDepth());
                configuration.common().updateDepth(c.getUpdateDepth());
                configuration = Db4oEmbedded.newConfiguration();
                configuration.common().activationDepth(c.getActivationDepth());
                configuration.common().updateDepth(c.getUpdateDepth());

-               configuration.common().objectClass(Owner.class).cascadeOnDelete(true);
+               configuration.common().objectClass(Owner.class).cascadeOnUpdate(true);
+               configuration.common().objectClass(RuralHouse.class).cascadeOnUpdate(true);
+               configuration.common().objectClass(Account.class).cascadeOnUpdate(true);

                db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
        }
 
                db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
        }
 


@@ -463,11 +465,10 @@ public class DB4oManager {
                        if (result.isEmpty()) {
                                Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
                                ObjectSet<RuralHouse> orh = db.queryByExample(new RuralHouse(null, ow, null, null, null));
                        if (result.isEmpty()) {
                                Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
                                ObjectSet<RuralHouse> orh = db.queryByExample(new RuralHouse(null, ow, null, null, null));

+                               ow.addRuralHouse(rh);

                                for (RuralHouse aa: orh){
                                for (RuralHouse aa: orh){

-                                       db.delete(aa);
+                                       aa.setOwner(ow);

                                }
                                }

-                               db.delete(ow);
-                               ow.addRuralHouse(rh);

                                db.store(ow);
                                db.commit();
                                stored = true;
                                db.store(ow);
                                db.commit();
                                stored = true;

diff --git a/ruralHouses/src/gui/ModifyHouseGUI.java b/ruralHouses/src/gui/ModifyHouseGUI.java
index 6b64b19..393a707 100644 (file)
--- a/ruralHouses/src/gui/ModifyHouseGUI.java
+++ b/ruralHouses/src/gui/ModifyHouseGUI.java
@@ -138,6 +138,7 @@ public class ModifyHouseGUI extends JFrame {
                                        owner.getRuralHouses().remove(rh);
                                        owner.getRuralHouses().add(newRh);
                                        houseBox.removeItem(rh);
                                        owner.getRuralHouses().remove(rh);
                                        owner.getRuralHouses().add(newRh);
                                        houseBox.removeItem(rh);

+                                       hm.removeHouse(rh, o);

                                        feedback.setText("House properly modified");
                                } else
                                        feedback.setText("Imposible to modify the house");
                                        feedback.setText("House properly modified");
                                } else
                                        feedback.setText("Imposible to modify the house");