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

Conflicts:
	ruralHouses/src/dataAccess/DB4oManager.java

diff --combined ruralHouses/src/dataAccess/DB4oManager.java
index 20f1b11,d83f6a9..b46eafa
--- 1/ruralHouses/src/dataAccess/DB4oManager.java
--- 2/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@@ -110,12 -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",
@@@ -134,15 -134,17 +134,15 @@@
        public Offer createOffer(RuralHouse ruralHouse, Date firstDay,
                        Date lastDay, float price) throws RemoteException, Exception {
                Offer o = null;
 -              
 +
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
 -              
 -              try {
  
 -                      
 +              try {
  
-                       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();
@@@ -158,8 -160,8 +158,8 @@@
                                        .println("Error: com.db4o.ext.ObjectNotStorableException in createOffer");
                } finally {
                        db.close();
 -                      return o;
                }
 +              return o;
        }
  
        public void deleteDB() {
@@@ -168,7 -170,7 +168,7 @@@
                        openSDB();
                else
                        openDB();
 -              
 +
                try {
                        Owner proto = new Owner(null, null);
                        ObjectSet result = db.queryByExample(proto);
@@@ -194,20 -196,20 +194,20 @@@
        public Booking createBooking(RuralHouse ruralHouse, Date firstDate,
                        Date lastDate, String bookTelephoneNumber)
                        throws OfferCanNotBeBooked {
 -              
 +
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
 -              
 +
                Booking bok = null;
 -              
 +
                try {
  
                        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);
@@@ -231,10 -233,8 +231,9 @@@
                                        .println("Error: com.db4o.ext.ObjectNotStorableException in createBooking");
                } catch (Exception exc) {
                        exc.printStackTrace();
 +              } finally {
 +                      db.close();
                }
- 
 -              db.close();
                return bok;
        }
  
@@@ -263,14 -263,14 +262,14 @@@
  
        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
                        Exception {
 -              
 +
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        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())
@@@ -283,17 -283,18 +282,17 @@@
  
        public boolean existsOverlappingOffer(RuralHouse rh, Date firstDay,
                        Date lastDay) throws RemoteException, OverlappingOfferExists {
 -              
 +
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
 -              
 +
                try {
 -                      
  
                        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();
@@@ -326,12 -327,12 +325,12 @@@
         */
        public Vector<Account> getAccount(String usr, String pwd)
                        throws RemoteException, Exception {
 -              
 +
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();
 -              
 +
                try {
                        Account proto = new Account(usr, pwd, new Owner(null, null));
                        ObjectSet<Account> result = db.queryByExample(proto);
@@@ -353,9 -354,9 +352,9 @@@
                        openSDB();
                else
                        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 +369,13 @@@
                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);
 -              
++                      openDB();               
+               RuralHouse house = new RuralHouse(houseName, null, null, null, null);
                try {
                        ObjectSet<RuralHouse> result = db.queryByExample(house);
                        if (!result.isEmpty()) {
@@@ -392,24 -393,46 +390,46 @@@
                }
  
        }
- 
-       public Vector<RuralHouse> getRuralHousesByTown(String town) {
-               RuralHouse rh = new RuralHouse(0, 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
                        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());
                        return ruralHouses;
 -              }finally{
 +              } finally {
                        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;
+               }
+               
+               
+               
        }
  }