Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 13:09:05 +0000 (14:09 +0100)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 13:09:05 +0000 (14:09 +0100)
Conflicts:
ruralHouses/src/gui/DeleteHouseGUI.java

1  2 
ruralHouses/src/businessLogic/HouseManager.java
ruralHouses/src/gui/DeleteHouseGUI.java

@@@ -37,10 -36,11 +37,10 @@@ public class DeleteHouseGUI extends JFr
                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");