DeleteHouses bug debugged

diff --combined ruralHouses/src/businessLogic/HouseManager.java
index f537eff,e1dfa57..ba1aed7
--- 1/ruralHouses/src/businessLogic/HouseManager.java
--- 2/ruralHouses/src/businessLogic/HouseManager.java
+++ b/ruralHouses/src/businessLogic/HouseManager.java
@@@ -44,10 -44,8 +44,11 @@@ public class HouseManager implements Ho
  
        
        
-       public void removeHouse(String houseName, Owner owner) {
 -      public void removeHouse(RuralHouse rh) {
 -              this.dbMngr.removeHouse(rh);
++
++      public void removeHouse(RuralHouse rh , Owner owner) {
 +              Vector<RuralHouse>  temp = owner.getRuralHouses();
-               temp.remove(temp.size() -1);
-               this.dbMngr.removeHouse(houseName, owner);
++              temp.remove(rh);
++              this.dbMngr.removeHouse(rh, owner);
        }
  
  
@@@ -73,6 -71,6 +74,10 @@@
                return this.dbMngr.getRuralHouseByName(Name);
        }
  
++
++
++
++
        // For future implementation
        // @Override
        // public void modifyHouse(int houseName, Owner owner, String description,

diff --combined ruralHouses/src/businessLogic/HouseManagerInterface.java
index 5e56aed,ee528cc..35670d9
--- 1/ruralHouses/src/businessLogic/HouseManagerInterface.java
--- 2/ruralHouses/src/businessLogic/HouseManagerInterface.java
+++ b/ruralHouses/src/businessLogic/HouseManagerInterface.java
@@@ -21,7 -21,7 +21,7 @@@ public interface HouseManagerInterface 
        // String description, String town, int nRooms, int nKitchens,
        // int nBaths, int nLivings, int nParkings);
  
-       public void removeHouse(String houseName);
 -      public void removeHouse(RuralHouse rh);
++      public void removeHouse(RuralHouse rh, Owner owner);
  
  
        /**

diff --combined ruralHouses/src/dataAccess/DB4oManager.java
index 553d4dc,8ab8d83..039dd62
--- 1/ruralHouses/src/dataAccess/DB4oManager.java
--- 2/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@@ -369,19 -369,16 +369,19 @@@ public class DB4oManager 
                return stored;
        }
  
-       public void removeHouse(String houseName, Owner owner) {
 -      public void removeHouse(RuralHouse rh) {
++
++      public void removeHouse(RuralHouse rh, Owner owner) {
  
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();               
-               RuralHouse house = new RuralHouse(houseName, null, null, null, null);
                try {
-                       ObjectSet<RuralHouse> result = db.queryByExample(house);
+                       ObjectSet<RuralHouse> result = db.queryByExample(rh);
                        if (!result.isEmpty()) {
                                RuralHouse found = (RuralHouse) result.get(0);
 +//                            db.delete(found.getOwner());
 +                              db.store(owner);
                                db.delete(found);
                                db.commit();
                        }

diff --combined ruralHouses/src/gui/DeleteHouseGUI.java
index 2719ede,b023c5a..935e0c5
--- 1/ruralHouses/src/gui/DeleteHouseGUI.java
--- 2/ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/ruralHouses/src/gui/DeleteHouseGUI.java
@@@ -4,6 -4,7 +4,7 @@@ import java.awt.BorderLayout
  import java.awt.EventQueue;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.util.Vector;
  
  import javax.swing.JFrame;
  import javax.swing.JPanel;
@@@ -31,14 -32,15 +32,15 @@@ public class DeleteHouseGUI extends JFr
         * Create the frame.
         */
        public DeleteHouseGUI(Owner o) {
-               owner = o;
+               this.owner = o;
                setBounds(100, 100, 450, 300);
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
- 
-               comboBox = new JComboBox(o.getRuralHouses());
 -                      
++      
+               comboBox = new JComboBox(this.owner.getRuralHouses());
                
+ 
                JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
                
                JButton btnDelete = new JButton("DELETE");
@@@ -82,8 -84,7 +84,9 @@@
        
        private void actionListenerButton(ActionEvent e){
                RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
 +              
                HouseManagerInterface hm = new HouseManager();
-               hm.removeHouse(toDel.getHouseName());
 -              hm.removeHouse(toDel);
++              hm.removeHouse(toDel,this.owner);
++              comboBox.removeItem(toDel);
        }
  }