Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
	ruralHouses/src/gui/DeleteHouseGUI.java

diff --combined ruralHouses/src/businessLogic/HouseManager.java
index a962603,72d8285..e1dfa57
--- 1/ruralHouses/src/businessLogic/HouseManager.java
--- 2/ruralHouses/src/businessLogic/HouseManager.java
+++ b/ruralHouses/src/businessLogic/HouseManager.java
@@@ -44,8 -44,8 +44,8 @@@ public class HouseManager implements Ho
  
        
        
 -      public void removeHouse(String houseName) {
 -              this.dbMngr.removeHouse(houseName);
 +      public void removeHouse(RuralHouse rh) {
 +              this.dbMngr.removeHouse(rh);
        }
  
  
@@@ -61,7 -61,6 +61,6 @@@
        @Override
        public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
                        Exception {
-               // TODO Auto-generated method stub
                return dbMngr.getAllRuralHouses();
        }
  

diff --combined ruralHouses/src/gui/DeleteHouseGUI.java
index 776cc51,d5c4386..b023c5a
--- 1/ruralHouses/src/gui/DeleteHouseGUI.java
--- 2/ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/ruralHouses/src/gui/DeleteHouseGUI.java
@@@ -4,7 -4,6 +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;
@@@ -32,15 -31,16 +32,15 @@@ public class DeleteHouseGUI extends JFr
         * Create the frame.
         */
        public DeleteHouseGUI(Owner o) {
 -              o = owner;
 +              this.owner = o;
                setBounds(100, 100, 450, 300);
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
 -
 -              o.getRuralHouses();
 -              
 -              comboBox = new JComboBox(o.getRuralHouses());
 +                      
 +              comboBox = new JComboBox(this.owner.getRuralHouses());
                
-               
++
                JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
                
                JButton btnDelete = new JButton("DELETE");
@@@ -85,6 -85,6 +85,6 @@@
        private void actionListenerButton(ActionEvent e){
                RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
                HouseManagerInterface hm = new HouseManager();
 -              hm.removeHouse(toDel.getHouseName());
 +              hm.removeHouse(toDel);
        }
  }