Bugs when deleting houses and offers fixed and GUI's adapated for empty cases

[RRRRHHHH_Code] / ruralHouses / src / businessLogic / HouseManager.java

diff --git a/ruralHouses/src/businessLogic/HouseManager.java b/ruralHouses/src/businessLogic/HouseManager.java
index 02574fc..4601b88 100644 (file)
--- a/ruralHouses/src/businessLogic/HouseManager.java
+++ b/ruralHouses/src/businessLogic/HouseManager.java
@@ -21,56 +21,38 @@ public class HouseManager implements HouseManagerInterface {
        }
 
 
-
-       @Override
-       public boolean registerNewHouse(String houseName, Owner owner,
-                       String description, String district, int nRooms, int nKitchens,
-                       int nBaths, int nLivings, int nParkings) {
-               
-               boolean stored = false;
+       private boolean suitsRegulations(int nKitchens, int nBaths, int nLivings) {
                if (nKitchens < 1 || nLivings < 3 || nBaths < 2)
                        return false;
-               HouseFeatures feature = new HouseFeatures(nRooms, nKitchens, nBaths,
-                               nLivings, nParkings);
-               RuralHouse rh = new RuralHouse(houseName,
-                               owner, description, district, feature);
-               owner.getRuralHouses().add(rh);
-               stored = this.dbMngr.storeRuralHouses(rh);
-               return stored;
+               else
+                       return true;
        }
-       
-       @Override
 
+       @Override
        public boolean registerNewHouse(RuralHouse rh) {
-               
+
                boolean stored = false;
-               
+               if (!suitsRegulations(rh.getFeatures().getnKitchens(), rh.getFeatures()
+                               .getnBaths(), rh.getFeatures().getnKitchens()))
+                       return false;
                rh.getOwner().getRuralHouses().add(rh);
                stored = this.dbMngr.storeRuralHouses(rh);
                return stored;
        }
-       
 
-       public void removeHouse(RuralHouse rh , Owner owner) {
-               Vector<RuralHouse>  temp = owner.getRuralHouses();
+       public void removeHouse(RuralHouse rh, Owner owner) {
+               Vector<RuralHouse> temp = owner.getRuralHouses();
                temp.remove(rh);
                this.dbMngr.removeHouse(rh, owner);
        }
 
 
 
-       @Override
-       public Vector<RuralHouse> getHousesByDistrict(String town) {
-               
-               return this.dbMngr.getRuralHousesByTown(town);
-       }
-       
-       public Vector<RuralHouse> getHouses(String town,int nBed , int nKit, int nBath, int nPark, int nLiv) {
-               
-               return this.dbMngr.getRuralHouses(town, nBed, nKit, nBath, nPark, nLiv);
-       }
-
+       public Vector<RuralHouse> getHouses(String name,String town, int nBed, int nKit,
+                       int nBath, int nPark, int nLiv) {
 
+               return this.dbMngr.getRuralHouses(name ,town, nBed, nKit, nBath, nPark, nLiv);
+       }
 
        @Override
        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
@@ -80,15 +62,6 @@ public class HouseManager implements HouseManagerInterface {
 
 
 
-       @Override
-       public RuralHouse getHouseByName(String Name) {
-               return this.dbMngr.getRuralHouseByName(Name);
-       }
-
-
-
-
-
        // For future implementation
        // @Override
        // public void modifyHouse(int houseName, Owner owner, String description,