From: pinene <epinzolas94@live.com>
Date: Tue, 10 Mar 2015 13:32:30 +0000 (+0100)
Subject: DeleteHouses bug debugged
X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/82c870d35fdb579d5205c0db10376897fccb4af1

DeleteHouses bug debugged
---

82c870d35fdb579d5205c0db10376897fccb4af1
diff --cc ruralHouses/src/businessLogic/HouseManager.java
index f537eff,e1dfa57..ba1aed7
--- a/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 --cc ruralHouses/src/businessLogic/HouseManagerInterface.java
index 5e56aed,ee528cc..35670d9
--- a/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 --cc ruralHouses/src/dataAccess/DB4oManager.java
index 553d4dc,8ab8d83..039dd62
--- a/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 --cc ruralHouses/src/gui/DeleteHouseGUI.java
index 2719ede,b023c5a..935e0c5
--- a/ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/ruralHouses/src/gui/DeleteHouseGUI.java
@@@ -36,9 -37,10 +37,10 @@@ public class DeleteHouseGUI extends JFr
  		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);
  	}
  }