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

Conflicts:
	ruralHouses/src/dataAccess/DB4oManager.java

diff --cc 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
@@@ -139,10 -139,12 +139,10 @@@ public class DB4oManager 
                        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();
@@@ -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;
        }
  
@@@ -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);
@@@ -375,9 -376,9 +374,8 @@@
                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()) {
@@@ -400,16 -401,38 +398,38 @@@
                        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;
+               }
+               
+               
+               
        }
  }