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

[RRRRHHHH_Code] / ruralHouses / src / gui / QueryAvailabilityGUI2.java

diff --git a/ruralHouses/src/gui/QueryAvailabilityGUI2.java b/ruralHouses/src/gui/QueryAvailabilityGUI2.java
index fef5d2a..40cfe1c 100644 (file)
--- a/ruralHouses/src/gui/QueryAvailabilityGUI2.java
+++ b/ruralHouses/src/gui/QueryAvailabilityGUI2.java
@@ -209,7 +209,7 @@ public class QueryAvailabilityGUI2 extends JFrame {
                popupMenu.add(lblNumberOfLivings);
 
                popupMenu.add(nLivings);
-               
+
                this.getContentPane().add(jCalendar2, null);
                this.getContentPane().add(jCalendar1, null);
                this.getContentPane().add(jLabel5, null);
@@ -286,7 +286,7 @@ public class QueryAvailabilityGUI2 extends JFrame {
 
        private void jButton1_actionPerformed(ActionEvent e) {
                if (this.district.isSelected()) {
-                       Vector<RuralHouse> houses = houseMan.getHouses(jComboBox1
+                       Vector<RuralHouse> houses = houseMan.getHouses(null, jComboBox1
                                        .getSelectedItem().toString(), Integer.parseInt(nBedrooms
                                        .getText()), Integer.parseInt(nKitchens.getText()), Integer
                                        .parseInt(nBaths.getText()), Integer.parseInt(nParkings
@@ -294,22 +294,34 @@ public class QueryAvailabilityGUI2 extends JFrame {
                        listOfHousesGUI list = new listOfHousesGUI(houses);
                        list.setVisible(true);
                } else if (this.ruralHouseName.isSelected()) {
-                       RuralHouse rh = houseMan.getHouseByName(jTextField3.getText());
-                       // The next instruction creates a java.sql.Date object from the date selected in the JCalendar object
-                       Date firstDay=new Date(jCalendar1.getCalendar().getTime().getTime());
-                       // The next instruction removes the hour, minute, second and ms from the date
-                       // This has to be made because the date will be stored in db4o as a java.util.Date object 
-                       // that would store those data, and that would give problems when comparing dates later
-                       firstDay=Date.valueOf(firstDay.toString());
-                       
-                       
-                       Date lastDay=new Date(jCalendar2.getCalendar().getTime().getTime());
-                   //Remove the hour:minute:second:ms from the date 
-                       lastDay=Date.valueOf(lastDay.toString());
-                       if (rh != null) {
-                               HouseFeaturesGUI hou = new HouseFeaturesGUI(rh,firstDay,lastDay);
+                       try {
+                               RuralHouse rh = houseMan.getHouses(jTextField3.getText(), null,
+                                               0, 0, 0, 0, 0).get(0);
+                               // The next instruction creates a java.sql.Date object from the
+                               // date selected in the JCalendar object
+                               Date firstDay = new Date(jCalendar1.getCalendar().getTime()
+                                               .getTime());
+                               // The next instruction removes the hour, minute, second and ms
+                               // from the date
+                               // This has to be made because the date will be stored in db4o
+                               // as a java.util.Date object
+                               // that would store those data, and that would give problems
+                               // when comparing dates later
+                               firstDay = Date.valueOf(firstDay.toString());
+                               
+                               Date lastDay = new Date(jCalendar2.getCalendar().getTime()
+                                               .getTime());
+                               // Remove the hour:minute:second:ms from the date
+                               lastDay = Date.valueOf(lastDay.toString());
+                               if(firstDay!=null&&lastDay!=null&&firstDay.before(lastDay)){
+                               HouseFeaturesGUI hou = new HouseFeaturesGUI(rh, firstDay,
+                                               lastDay);
                                hou.setVisible(true);
-                       } else {
+                               }else{
+                                       feedback.setText("Wrong Dates");
+                               }
+                               
+                       } catch (Exception e1) {
                                feedback.setText("Not matching houses");
                        }
                }
@@ -318,7 +330,6 @@ public class QueryAvailabilityGUI2 extends JFrame {
        private void jButton2_actionPerformed(ActionEvent e) {
                this.setVisible(false);
        }
-       
 
        private static void addPopup(Component component, final JPopupMenu popup) {
                component.addMouseListener(new MouseAdapter() {