House features gui created

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

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index adc1da4..12ff701 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -37,7 +37,7 @@ public class DB4oManager {
        private static DB4oManager theDB4oManager = null;
 
        private static DB4oManagerAux theDB4oManagerAux;
-       
+
        static ConfigXML c;
 
        private DB4oManager() throws Exception {
@@ -112,12 +112,14 @@ public class DB4oManager {
                try {
                        Owner jon = new Owner("Jon");
                        Owner alfredo = new Owner("Alfredo");
-                       jon.addRuralHouse("Ezkioko", "Ezkioko etxea", "Ezkio", 3, 3, 3, 3, 3);
-                       jon.addRuralHouse("Eskiatze", "Eskiatzeko etxea", "Jaca", 4, 4, 4, 4, 4);
+                       jon.addRuralHouse("Ezkioko", "Ezkioko etxea", "Beatriz", 3, 3, 3, 3,
+                                       3);
+                       jon.addRuralHouse("Eskiatze", "Eskiatzeko etxea", "Guazate", 4, 4, 4,
+                                       4, 4);
                        jon.setBankAccount("1349 5677 21 2133567777");
-                       alfredo.addRuralHouse("Aitonako", "Casa del abuelo", "Pitillas", 5, 5, 5, 5,
-                                       5);
-                       alfredo.addRuralHouse("Murgoitz", "", "Murgia", 6, 6, 6, 6, 6);
+                       alfredo.addRuralHouse("Aitonako", "Casa del abuelo", "Vegas", 5,
+                                       5, 5, 5, 5);
+                       alfredo.addRuralHouse("Murgoitz", "", "Cedro", 6, 6, 6, 6, 6);
                        alfredo.setBankAccount("4144 0087 23 9700002133");
                        Account jonAcc = new Account("userJon", "passJon", jon);
                        Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
@@ -153,8 +155,7 @@ public class DB4oManager {
                        db.close();
                }
        }
-       
-       
+
        @SuppressWarnings("finally")
        public Offer createOffer(RuralHouse ruralHouse, Date firstDay,
                        Date lastDay, float price) throws RemoteException, Exception {
@@ -167,8 +168,8 @@ public class DB4oManager {
 
                try {
 
-                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(),
-                                       null, null, null, null);
+                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(), null,
+                                       null, null, null);
                        ObjectSet result = db.queryByExample(proto);
                        RuralHouse rh = (RuralHouse) result.next();
                        o = rh.createOffer(theDB4oManagerAux.offerNumber++, firstDay,
@@ -196,7 +197,6 @@ public class DB4oManager {
 
                try {
 
-                       
                        db.store(offer);
                        db.commit();
 
@@ -208,9 +208,10 @@ public class DB4oManager {
                }
                return offer;
        }
-       
+
        @SuppressWarnings("finally")
-       public void deleteOffer(RuralHouse rh, Offer offer) throws RemoteException, Exception {
+       public void deleteOffer(RuralHouse rh, Offer offer) throws RemoteException,
+                       Exception {
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -229,7 +230,6 @@ public class DB4oManager {
                        db.close();
                }
        }
-       
 
        /**
         * This method creates a book with a corresponding parameters
@@ -254,9 +254,8 @@ public class DB4oManager {
                        if (c.isDatabaseLocal() == false)
                                openSDB();
 
-                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(),
-                                       null, ruralHouse.getDescription(), ruralHouse.getDistrict(),
-                                       null);
+                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(), null,
+                                       ruralHouse.getDescription(), ruralHouse.getDistrict(), null);
                        ObjectSet result = db.queryByExample(proto);
                        RuralHouse rh = (RuralHouse) result.next();
 
@@ -337,10 +336,9 @@ public class DB4oManager {
 
                try {
 
-                       RuralHouse rhn = (RuralHouse) db
-                                       .queryByExample(
-                                                       new RuralHouse(rh.getHouseName(), null, null,
-                                                                       null, null)).next();
+                       RuralHouse rhn = (RuralHouse) db.queryByExample(
+                                       new RuralHouse(rh.getHouseName(), null, null, null, null))
+                                       .next();
                        if (rhn.overlapsWith(firstDay, lastDay) != null)
                                throw new OverlappingOfferExists();
                        else
@@ -401,8 +399,8 @@ public class DB4oManager {
                        openDB();
 
                boolean stored = false;
-               RuralHouse house = new RuralHouse(rh.getHouseName(), null, null,
-                               null, null);
+               RuralHouse house = new RuralHouse(rh.getHouseName(), null, null, null,
+                               null);
                try {
                        ObjectSet<Owner> result = db.queryByExample(house);
                        if (result.isEmpty()) {
@@ -416,18 +414,17 @@ public class DB4oManager {
                return stored;
        }
 
-
        public void removeHouse(RuralHouse rh, Owner owner) {
 
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
-                       openDB();               
+                       openDB();
                try {
                        ObjectSet<RuralHouse> result = db.queryByExample(rh);
                        if (!result.isEmpty()) {
                                RuralHouse found = (RuralHouse) result.get(0);
-//                             db.delete(found.getOwner());
+                               // db.delete(found.getOwner());
                                db.store(owner);
                                db.delete(found);
                                db.commit();
@@ -439,10 +436,10 @@ public class DB4oManager {
                }
 
        }
-       
-       public Vector<RuralHouse> getRuralHousesByTown(String town){
-               RuralHouse rh = new RuralHouse(null,null,null,town,null);
-               
+
+       public Vector<RuralHouse> getRuralHousesByTown(String town) {
+               RuralHouse rh = new RuralHouse(null, null, null, town, null);
+
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -459,49 +456,50 @@ public class DB4oManager {
                }
 
        }
-       public RuralHouse getRuralHouseByName(String name){
-               RuralHouse rh = new RuralHouse(name,null,null,null,null);
-               
+
+       public RuralHouse getRuralHouseByName(String name) {
+               RuralHouse rh = new RuralHouse(name, null, null, null, null);
+
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
-               
-               try{
+
+               try {
                        ObjectSet<RuralHouse> result = db.queryByExample(rh);
                        Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
-                       while(result.hasNext())
+                       while (result.hasNext())
                                ruralHouses.add(result.next());
                        db.close();
-                       return ruralHouses.get(0);
-               } catch (NullPointerException e){
+                       if (!ruralHouses.isEmpty())
+                               return ruralHouses.get(0);
+                       else
+                               return null;
+               } catch (NullPointerException e) {
                        return null;
                }
-               
-               
-               
+
        }
-       
-       public Vector<RuralHouse> getRuralHouses(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(null,null,null,town,fea);
+
+       public Vector<RuralHouse> getRuralHouses(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(null, null, null, town, fea);
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
-               
-               try{
+
+               try {
                        ObjectSet<RuralHouse> result = db.queryByExample(rh);
                        Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
-                       while(result.hasNext())
+                       while (result.hasNext())
                                ruralHouses.add(result.next());
                        db.close();
                        return ruralHouses;
-               } catch (NullPointerException e){
+               } catch (NullPointerException e) {
                        return null;
                }
-               
-               
-               
+
        }
 }