Separate DB almost fixed

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

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 403c916..a424473 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -516,7 +516,14 @@ public class DB4oManager {
        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);
+               RuralHouse rh;
+               if (ow != null) {
+                       Owner own = new Owner(ow.getName(), ow.getBankAccount(),
+                                       ow.getMailAccount());
+                       rh = new RuralHouse(name, own, null, town, fea);
+               }else{
+                       rh = new RuralHouse(name, ow, null, town, fea);
+               }
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -632,7 +639,9 @@ public class DB4oManager {
 
                try {
                        Offer of = (Offer) db.queryByExample(
-                                       new Offer(0, o.getRuralHouse(), null, null, 0)).get(0);
+                                       new Offer(o.getOfferNumber(), new RuralHouse(o
+                                                       .getRuralHouse().getHouseName(), null, null, null,
+                                                       null), null, null, 0)).get(0);
                        Booking proto = new Booking(0, of, null, null);
                        ObjectSet<Booking> result = db.queryByExample(proto);
                        return new Vector<Booking>(result);