house code changed to name

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

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 15b2ad4..d83f6a9 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -110,12 +110,12 @@ public class DB4oManager {
                try {
                        Owner jon = new Owner("Jon");
                        Owner alfredo = new Owner("Alfredo");
-                       jon.addRuralHouse(1, "Ezkioko etxea", "Ezkio", 3, 3, 3, 3, 3);
-                       jon.addRuralHouse(2, "Eskiatzeko etxea", "Jaca", 4, 4, 4, 4, 4);
+                       jon.addRuralHouse("Ezkio", "Ezkioko etxea", "Ezkio", 3, 3, 3, 3, 3);
+                       jon.addRuralHouse("Eskia", "Eskiatzeko etxea", "Jaca", 4, 4, 4, 4, 4);
                        jon.setBankAccount("1349 5677 21 2133567777");
-                       alfredo.addRuralHouse(3, "Casa del abuelo", "Pitillas", 5, 5, 5, 5,
+                       alfredo.addRuralHouse("Aitonako", "Casa del abuelo", "Pitillas", 5, 5, 5, 5,
                                        5);
-                       alfredo.addRuralHouse(4, "", "Murgia", 6, 6, 6, 6, 6);
+                       alfredo.addRuralHouse("Murgoitz", "", "Murgia", 6, 6, 6, 6, 6);
                        alfredo.setBankAccount("4144 0087 23 9700002133");
                        Account jonAcc = new Account("userJon", "passJon", jon);
                        Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
@@ -144,7 +144,7 @@ public class DB4oManager {
 
                        
 
-                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseNumber(),
+                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(),
                                        null, null, null, null);
                        ObjectSet result = db.queryByExample(proto);
                        RuralHouse rh = (RuralHouse) result.next();
@@ -159,6 +159,7 @@ public class DB4oManager {
                        System.out
                                        .println("Error: com.db4o.ext.ObjectNotStorableException in createOffer");
                } finally {
+                       db.close();
                        return o;
                }
        }
@@ -208,7 +209,7 @@ public class DB4oManager {
                        if (c.isDatabaseLocal() == false)
                                openSDB();
 
-                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseNumber(),
+                       RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(),
                                        null, ruralHouse.getDescription(), ruralHouse.getTown(),
                                        null);
                        ObjectSet result = db.queryByExample(proto);
@@ -233,7 +234,7 @@ public class DB4oManager {
                } catch (Exception exc) {
                        exc.printStackTrace();
                }
-               
+               db.close();
                return bok;
        }
 
@@ -269,7 +270,7 @@ public class DB4oManager {
                        openDB();
 
                try {
-                       RuralHouse proto = new RuralHouse(0, null, null, null, null);
+                       RuralHouse proto = new RuralHouse(null, null, null, null, null);
                        ObjectSet result = db.queryByExample(proto);
                        Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
                        while (result.hasNext())
@@ -293,7 +294,7 @@ public class DB4oManager {
 
                        RuralHouse rhn = (RuralHouse) db
                                        .queryByExample(
-                                                       new RuralHouse(rh.getHouseNumber(), null, null,
+                                                       new RuralHouse(rh.getHouseName(), null, null,
                                                                        null, null)).next();
                        if (rhn.overlapsWith(firstDay, lastDay) != null)
                                throw new OverlappingOfferExists();
@@ -355,7 +356,7 @@ public class DB4oManager {
                        openDB();
                
                boolean stored = false;
-               RuralHouse house = new RuralHouse(rh.getHouseNumber(), null, null,
+               RuralHouse house = new RuralHouse(rh.getHouseName(), null, null,
                                null, null);
                try {
                        ObjectSet<Owner> result = db.queryByExample(house);
@@ -370,14 +371,14 @@ public class DB4oManager {
                return stored;
        }
 
-       public void removeHouse(int houseNumber) {
+       public void removeHouse(String houseName) {
 
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
                
-               RuralHouse house = new RuralHouse(houseNumber, null, null, null, null);
+               RuralHouse house = new RuralHouse(houseName, null, null, null, null);
                try {
                        ObjectSet<RuralHouse> result = db.queryByExample(house);
                        if (!result.isEmpty()) {
@@ -394,7 +395,7 @@ public class DB4oManager {
        }
        
        public Vector<RuralHouse> getRuralHousesByTown(String town){
-               RuralHouse rh = new RuralHouse(0,null,null,town,null);
+               RuralHouse rh = new RuralHouse(null,null,null,town,null);
                
                if (c.isDatabaseLocal() == false)
                        openSDB();
@@ -411,5 +412,27 @@ public class DB4oManager {
                        db.close();
                }
                
+       }
+       public RuralHouse getRuralHouseByName(String name){
+               RuralHouse rh = new RuralHouse(name,null,null,null,null);
+               
+               if (c.isDatabaseLocal() == false)
+                       openSDB();
+               else
+                       openDB();
+               
+               try{
+                       ObjectSet<RuralHouse> result = db.queryByExample(rh);
+                       Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
+                       while(result.hasNext())
+                               ruralHouses.add(result.next());
+                       db.close();
+                       return ruralHouses.get(0);
+               } catch (NullPointerException e){
+                       return null;
+               }
+               
+               
+               
        }
 }