Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

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

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 6089a74..d8a59f2 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -219,7 +219,24 @@ public class DB4oManager {
                }
        }
 
                }
        }
 

-       public Administrator getAdminData() {
+       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);
+                       Offer proto = new Offer(0, rh, null, null, 0);
+                       ObjectSet<Offer> result = db.queryByExample(proto);
+                       return new Vector<Offer>(result);
+               } finally {
+                       db.close();
+               }
+       }
+       
+       public Administrator getAdminData(){
+

                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else


@@ -354,6 +371,7 @@ public class DB4oManager {
                }
        }
 
                }
        }
 

+       

        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
                        Exception {
 
        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
                        Exception {
 


@@ -365,10 +383,7 @@ public class DB4oManager {
                try {
                        RuralHouse proto = new RuralHouse(null, null, null, null, null);
                        ObjectSet<RuralHouse> result = db.queryByExample(proto);
                try {
                        RuralHouse proto = new RuralHouse(null, null, null, null, null);
                        ObjectSet<RuralHouse> result = db.queryByExample(proto);

-                       Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
-                       while (result.hasNext())
-                               ruralHouses.add((RuralHouse) result.next());
-                       return ruralHouses;
+                       return new Vector<RuralHouse>(result);

                } finally {
                        db.close();
                }
                } finally {
                        db.close();
                }


@@ -493,10 +508,10 @@ public class DB4oManager {
 
        }
 
 
        }
 

-       public Vector<RuralHouse> getRuralHouses(String name, String town,
+       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);
                        int nBed, int nKit, int nBath, int nPark, int nLiv) {
                HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);

-               RuralHouse rh = new RuralHouse(name, null, null, town, fea);
+               RuralHouse rh = new RuralHouse(name, ow, null, town, fea);

                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else