house code changed to name
authorEneko Pinzolas Murua <kelossus@localhost.localdomain>
Tue, 10 Mar 2015 12:15:11 +0000 (13:15 +0100)
committerEneko Pinzolas Murua <kelossus@localhost.localdomain>
Tue, 10 Mar 2015 12:15:11 +0000 (13:15 +0100)
ruralHouses/src/businessLogic/HouseManager.java
ruralHouses/src/businessLogic/HouseManagerInterface.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Owner.java
ruralHouses/src/domain/RuralHouse.java
ruralHouses/src/gui/BookRuralHouseGUI.java
ruralHouses/src/gui/DeleteHouseGUI.java
ruralHouses/src/gui/NewHouseGUI.java
ruralHouses/src/gui/QueryAvailabilityGUI.java

index e50f4bb..4cb6254 100644 (file)
@@ -26,16 +26,17 @@ public class HouseManager implements HouseManagerInterface {
 
 
        @Override
-       public boolean registerNewHouse(int houseNumber, Owner owner,
-                       String description, String town, int nRooms, int nKitchens,
+       public boolean registerNewHouse(String houseName, Owner owner,
+                       String description, String district, int nRooms, int nKitchens,
                        int nBaths, int nLivings, int nParkings) {
+               
                boolean stored = false;
                if (nKitchens < 1 || nLivings < 3 || nBaths < 2)
                        return false;
                HouseFeatures feature = new HouseFeatures(nRooms, nKitchens, nBaths,
                                nLivings, nParkings);
-               RuralHouse rh = new RuralHouse(houseNumber,
-                               owner, description, town, feature);
+               RuralHouse rh = new RuralHouse(houseName,
+                               owner, description, district, feature);
                owner.getRuralHouses().add(rh);
                stored = this.dbMngr.storeRuralHouses(rh);
                return stored;
@@ -43,14 +44,14 @@ public class HouseManager implements HouseManagerInterface {
 
        
        
-       public void removeHouse(int houseNumber) {
-               this.dbMngr.removeHouse(houseNumber);
+       public void removeHouse(String houseName) {
+               this.dbMngr.removeHouse(houseName);
        }
 
 
 
        @Override
-       public Vector<RuralHouse> getHousesByTown(String town) {
+       public Vector<RuralHouse> getHousesByDistrict(String town) {
                
                return this.dbMngr.getRuralHousesByTown(town);
        }
@@ -64,9 +65,16 @@ public class HouseManager implements HouseManagerInterface {
                return dbMngr.getAllRuralHouses();
        }
 
+
+
+       @Override
+       public RuralHouse getHouseByName(String Name) {
+               return this.dbMngr.getRuralHouseByName(Name);
+       }
+
        // For future implementation
        // @Override
-       // public void modifyHouse(int houseNumber, Owner owner, String description,
+       // public void modifyHouse(int houseName, Owner owner, String description,
        // String town, int nRooms, int nKitchens, int nBaths, int nLivings,
        // int nParkings) {
        // // TODO Auto-generated method stub
index fd5462f..5e56aed 100644 (file)
@@ -12,20 +12,26 @@ public interface HouseManagerInterface {
 
 
 
-       public boolean registerNewHouse(int houseNumber, Owner owner,
+       public boolean registerNewHouse(String houseName, Owner owner,
                        String description, String town, int nRooms, int nKitchens,
                        int nBaths, int nLivings, int nParkings);
 
        // For future implementation
-       // public void modifyHouse(int houseNumber, Owner owner,
+       // public void modifyHouse(int houseName, Owner owner,
        // String description, String town, int nRooms, int nKitchens,
        // int nBaths, int nLivings, int nParkings);
 
-       public void removeHouse(int houseNumber);
+       public void removeHouse(String houseName);
 
 
-       public Vector<RuralHouse> getHousesByTown(String town);
+       /**
+        * @param district
+        * @return
+        */
+       public Vector<RuralHouse> getHousesByDistrict(String district);
+       
        
+       public RuralHouse getHouseByName(String Name);
        /**
         * This method retrieves the existing  rural houses 
         * 
index 15b2ad4..d83f6a9 100644 (file)
@@ -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;
+               }
+               
+               
+               
        }
 }
index cd68e3c..010ff64 100644 (file)
@@ -43,11 +43,11 @@ public class Owner implements Serializable {
 
 
 
-       public RuralHouse addRuralHouse(int houseNumber, String description,
+       public RuralHouse addRuralHouse(String houseName, String description,
                        String town, int nRooms, int nKitchens, int nBaths, int nLivings,
                        int nParkings) {
                HouseFeatures feature = new HouseFeatures(nRooms, nKitchens, nBaths, nLivings, nParkings);
-               RuralHouse rh = new RuralHouse(houseNumber, this, description, town,feature);
+               RuralHouse rh = new RuralHouse(houseName, this, description, town,feature);
                ruralHouses.add(rh);
                return rh;
        }
index 2ab7ac9..9b2ca05 100644 (file)
@@ -9,19 +9,20 @@ public class RuralHouse implements Serializable {
 
        private static final long serialVersionUID = 1L;
 
-       private int houseNumber;
+       private String houseName;
        private String description;
        private Owner owner;
        private String town; 
        private HouseFeatures features;
        public Vector<Offer> offers;
+       public boolean isAccepted;
        
        public RuralHouse() {
                super();
        }
 
-       public RuralHouse(int houseNumber, Owner owner, String description, String town ,HouseFeatures features) {
-               this.houseNumber = houseNumber;
+       public RuralHouse(String houseName, Owner owner, String description, String town , HouseFeatures features) {
+               this.houseName = houseName;
                this.description = description;
                this.owner = owner;
                this.town = town;
@@ -31,12 +32,12 @@ public class RuralHouse implements Serializable {
        
        
 
-       public int getHouseNumber() {
-               return houseNumber;
+       public String getHouseName() {
+               return houseName;
        }
 
-       public void setHouseNumber(int houseNumber) {
-               this.houseNumber = houseNumber;
+       public void setHouseName(String houseName) {
+               this.houseName = houseName;
        }
 
        public String getDescription() {
@@ -70,7 +71,7 @@ public class RuralHouse implements Serializable {
                this.features = features;
        }       
        public String toString() {
-               return this.houseNumber + ": " + this.town;
+               return this.houseName + ": " + this.town;
        }
        
        public Offer createOffer(int offerNumber,Date firstDay, Date lastDay, float price)  {
@@ -80,13 +81,8 @@ public class RuralHouse implements Serializable {
        }
 
 
-       @Override
-       public int hashCode() {
-               final int prime = 31;
-               int result = 1;
-               result = prime * result + houseNumber;
-               return result;
-       }
+
+
 
        @Override
        public boolean equals(Object obj) {
@@ -97,15 +93,15 @@ public class RuralHouse implements Serializable {
                if (getClass() != obj.getClass())
                        return false;
                RuralHouse other = (RuralHouse) obj;
-               if (houseNumber != other.houseNumber)
+               if (houseName != other.houseName)
                        return false;
                return true;
        }
        
-       public String getAccountNumber(int houseNumber) {
+       public String getAccountNumber(int houseName) {
                /*try {
                        dbMngr=DBManager.getInstance();
-                       return dbMngr.getOwner(houseNumber).getBankAccount();
+                       return dbMngr.getOwner(houseName).getBankAccount();
 
                } catch (Exception e) {
                        System.out.println("Error, accessing to DB Manager: "
@@ -117,7 +113,7 @@ public class RuralHouse implements Serializable {
        /**
         * This method obtains available offers for a concrete house in a certain period 
         * 
-        * @param houseNumber, the house number where the offers must be obtained 
+        * @param houseName, the house number where the offers must be obtained 
         * @param firstDay, first day in a period range 
         * @param lastDay, last day in a period range
         * @return a vector of offers(Offer class)  available  in this period
index 8e6d7b5..7a262fc 100644 (file)
@@ -57,7 +57,7 @@ public BookRuralHouseGUI()
       e.printStackTrace();
     }
   }
-  public BookRuralHouseGUI(int houseNumber,Date firstDay,Date lastDay)
+  public BookRuralHouseGUI(String houseName,Date firstDay,Date lastDay)
   {
     try
     {
@@ -66,7 +66,7 @@ public BookRuralHouseGUI()
       
       // Put the "houseNumber", "firstDay" and "lastDay" in the graphical components of the user interface
       for (int i=0; i<ruralHouses.size();i++){
-         if (((RuralHouse)ruralHouses.get(i)).getHouseNumber()==houseNumber) {
+         if (((RuralHouse)ruralHouses.get(i)).getHouseName()==houseName) {
                  jComboBox1.setSelectedIndex(i);
                  break;
          }
index b369391..52c73a0 100644 (file)
@@ -85,6 +85,6 @@ public class DeleteHouseGUI extends JFrame {
        private void actionListenerButton(ActionEvent e){
                RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
                HouseManagerInterface hm = new HouseManager();
-               hm.removeHouse(toDel.getHouseNumber());
+               hm.removeHouse(toDel.getHouseName());
        }
 }
index cb5ef2b..b4639f4 100644 (file)
@@ -124,7 +124,7 @@ public class NewHouseGUI extends JFrame {
                                try {
                                        HouseManagerInterface hm = new HouseManager();
                                        //TODO when the house is not added show a warning to the user. Method below returns a boolean stating that.
-                                       hm.registerNewHouse(Integer.parseInt(Code_f.getText()),
+                                       hm.registerNewHouse(Code_f.getText(),
                                                                owner, description_f.getText(),
                                                                Town_f.getText() ,Integer.parseInt(rooms_f.getText()),
                                                                                Integer.parseInt(kitchens_f.getText()),
index 287300b..6ecc838 100644 (file)
@@ -76,7 +76,7 @@ private static final long serialVersionUID = 1L;
     this.setSize(new Dimension(433, 548));
     this.setTitle("Query availability");
     jLabel1.setText("Rural house code:");
-    jLabel1.setBounds(new Rectangle(40, 20, 105, 25));
+    jLabel1.setBounds(new Rectangle(27, 20, 128, 25));
     jLabel2.setText("First day:");
     jLabel2.setBounds(new Rectangle(40, 55, 75, 25));
     jTextField2.setBounds(new Rectangle(190, 210, 155, 25));
@@ -128,11 +128,11 @@ private static final long serialVersionUID = 1L;
        @Override
        public void mouseClicked(MouseEvent e) {
                int i=table.getSelectedRow();
-               int houseNumber = (Integer) tableModel.getValueAt(i,1);
+               String houseName =  (String) tableModel.getValueAt(i,1);
                        Date firstDate=new Date(((java.util.Date)tableModel.getValueAt(i,2)).getTime());
                        Date lastDate=new Date(((java.util.Date)tableModel.getValueAt(i,3)).getTime());
        
-                       BookRuralHouseGUI b=new BookRuralHouseGUI(houseNumber,firstDate,lastDate);
+                       BookRuralHouseGUI b=new BookRuralHouseGUI(houseName,firstDate,lastDate);
                        b.setVisible(true);}
     });
 
@@ -233,7 +233,7 @@ private static final long serialVersionUID = 1L;
                                        System.out.println("Offer retrieved: "+of.toString());
                                        Vector<Object> row = new Vector<Object>();
                                        row.add(of.getOfferNumber());
-                                       row.add(of.getRuralHouse().getHouseNumber());
+                                       row.add(of.getRuralHouse().getHouseName());
 
                                        // Dates are stored in db4o as java.util.Date objects instead of java.sql.Date objects
                                        // They have to be converted into java.sql.Date objects before