X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/blobdiff_plain/44451eb517505374d4c8ea1c2c706307f9b0a382..e168688434227fc59065555c0bb408fc17e2ebc2:/ruralHouses/src/gui/QueryAvailabilityGUI.java

diff --git a/ruralHouses/src/gui/QueryAvailabilityGUI.java b/ruralHouses/src/gui/QueryAvailabilityGUI.java
index cfad48a..287300b 100644
--- a/ruralHouses/src/gui/QueryAvailabilityGUI.java
+++ b/ruralHouses/src/gui/QueryAvailabilityGUI.java
@@ -1,10 +1,9 @@
 package gui;
 
-import businessLogic.ApplicationFacadeInterface;
+import businessLogic.HouseManager;
 
 import com.toedter.calendar.JCalendar;
 
-import configuration.ConfigXML;
 import domain.Offer;
 import domain.RuralHouse;
 
@@ -48,8 +47,7 @@ private static final long serialVersionUID = 1L;
   	};
 
 
-  private static configuration.ConfigXML c;
-	
+  																					
   public QueryAvailabilityGUI()
   {
   	
@@ -66,9 +64,9 @@ private static final long serialVersionUID = 1L;
 
   private void jbInit() throws Exception
   {
-	ApplicationFacadeInterface facade=StartWindow.getBusinessLogic();
+	HouseManager houseM = new HouseManager();
 		
-	Vector<RuralHouse> rhs=facade.getAllRuralHouses();
+	Vector<RuralHouse> rhs=houseM.getAllRuralHouses();
 	
 	comboBox = new JComboBox(rhs);
 	//comboBox.setModel(new DefaultComboBoxModel(rhs));
@@ -130,7 +128,7 @@ private static final long serialVersionUID = 1L;
     	@Override
     	public void mouseClicked(MouseEvent e) {
     		int i=table.getSelectedRow();
-    		int houseNumber = (int) tableModel.getValueAt(i,1);
+    		int houseNumber = (Integer) 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());
 	
@@ -219,7 +217,6 @@ private static final long serialVersionUID = 1L;
     	
     	try {
     		
-    		ApplicationFacadeInterface facade=StartWindow.getBusinessLogic();
 
     		Vector<Offer> v=rh.getOffers(firstDay, lastDay);
   
@@ -234,7 +231,7 @@ private static final long serialVersionUID = 1L;
 				while (en.hasMoreElements()) {
 					of=en.nextElement();
 					System.out.println("Offer retrieved: "+of.toString());
-					Vector row = new Vector();
+					Vector<Object> row = new Vector<Object>();
 					row.add(of.getOfferNumber());
 					row.add(of.getRuralHouse().getHouseNumber());