projects
/
RRRRHHHH_Code
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5c77c50
)
temp
author
Eneko Pinzolas Murua
<kelossus@localhost.localdomain>
Tue, 10 Mar 2015 13:23:13 +0000
(14:23 +0100)
committer
Eneko Pinzolas Murua
<kelossus@localhost.localdomain>
Tue, 10 Mar 2015 13:23:13 +0000
(14:23 +0100)
ruralHouses/src/businessLogic/HouseManager.java
patch
|
blob
|
history
ruralHouses/src/dataAccess/DB4oManager.java
patch
|
blob
|
history
ruralHouses/src/gui/DeleteHouseGUI.java
patch
|
blob
|
history
ruralHouses/src/gui/QueryAvailabilityGUI.java
patch
|
blob
|
history
diff --git
a/ruralHouses/src/businessLogic/HouseManager.java
b/ruralHouses/src/businessLogic/HouseManager.java
index
72d8285
..
f537eff
100644
(file)
--- a/
ruralHouses/src/businessLogic/HouseManager.java
+++ b/
ruralHouses/src/businessLogic/HouseManager.java
@@
-44,8
+44,10
@@
public class HouseManager implements HouseManagerInterface {
- public void removeHouse(String houseName) {
- this.dbMngr.removeHouse(houseName);
+ public void removeHouse(String houseName, Owner owner) {
+ Vector<RuralHouse> temp = owner.getRuralHouses();
+ temp.remove(temp.size() -1);
+ this.dbMngr.removeHouse(houseName, owner);
}
}
diff --git
a/ruralHouses/src/dataAccess/DB4oManager.java
b/ruralHouses/src/dataAccess/DB4oManager.java
index
b46eafa
..
553d4dc
100644
(file)
--- a/
ruralHouses/src/dataAccess/DB4oManager.java
+++ b/
ruralHouses/src/dataAccess/DB4oManager.java
@@
-369,7
+369,7
@@
public class DB4oManager {
return stored;
}
return stored;
}
- public void removeHouse(String houseName) {
+ public void removeHouse(String houseName
, Owner owner
) {
if (c.isDatabaseLocal() == false)
openSDB();
if (c.isDatabaseLocal() == false)
openSDB();
@@
-380,6
+380,8
@@
public class DB4oManager {
ObjectSet<RuralHouse> result = db.queryByExample(house);
if (!result.isEmpty()) {
RuralHouse found = (RuralHouse) result.get(0);
ObjectSet<RuralHouse> result = db.queryByExample(house);
if (!result.isEmpty()) {
RuralHouse found = (RuralHouse) result.get(0);
+// db.delete(found.getOwner());
+ db.store(owner);
db.delete(found);
db.commit();
}
db.delete(found);
db.commit();
}
diff --git
a/ruralHouses/src/gui/DeleteHouseGUI.java
b/ruralHouses/src/gui/DeleteHouseGUI.java
index
d5c4386
..
2719ede
100644
(file)
--- a/
ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/
ruralHouses/src/gui/DeleteHouseGUI.java
@@
-31,14
+31,12
@@
public class DeleteHouseGUI extends JFrame {
* Create the frame.
*/
public DeleteHouseGUI(Owner o) {
* Create the frame.
*/
public DeleteHouseGUI(Owner o) {
- o
= owner
;
+ o
wner = o
;
setBounds(100, 100, 450, 300);
contentPane = new JPanel();
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
setContentPane(contentPane);
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());
JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
comboBox = new JComboBox(o.getRuralHouses());
JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
@@
-84,6
+82,7
@@
public class DeleteHouseGUI extends JFrame {
private void actionListenerButton(ActionEvent e){
RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
private void actionListenerButton(ActionEvent e){
RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
+
HouseManagerInterface hm = new HouseManager();
hm.removeHouse(toDel.getHouseName());
}
HouseManagerInterface hm = new HouseManager();
hm.removeHouse(toDel.getHouseName());
}
diff --git
a/ruralHouses/src/gui/QueryAvailabilityGUI.java
b/ruralHouses/src/gui/QueryAvailabilityGUI.java
index
6ecc838
..
e34ec02
100644
(file)
--- a/
ruralHouses/src/gui/QueryAvailabilityGUI.java
+++ b/
ruralHouses/src/gui/QueryAvailabilityGUI.java
@@
-66,6
+66,8
@@
private static final long serialVersionUID = 1L;
{
HouseManager houseM = new HouseManager();
{
HouseManager houseM = new HouseManager();
+
+
Vector<RuralHouse> rhs=houseM.getAllRuralHouses();
comboBox = new JComboBox(rhs);
Vector<RuralHouse> rhs=houseM.getAllRuralHouses();
comboBox = new JComboBox(rhs);