projects
/
RRRRHHHH_Code
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
database management
[RRRRHHHH_Code]
/
ruralHouses
/
src
/
dataAccess
/
DB4oManager.java
diff --git
a/ruralHouses/src/dataAccess/DB4oManager.java
b/ruralHouses/src/dataAccess/DB4oManager.java
index
0e6e881
..
eb47769
100644
(file)
--- a/
ruralHouses/src/dataAccess/DB4oManager.java
+++ b/
ruralHouses/src/dataAccess/DB4oManager.java
@@
-459,9
+459,12
@@
public class DB4oManager {
RuralHouse house = new RuralHouse(rh.getHouseName(), null, null, null,
null);
try {
RuralHouse house = new RuralHouse(rh.getHouseName(), null, null, null,
null);
try {
- ObjectSet<
Owner
> result = db.queryByExample(house);
+ ObjectSet<
RuralHouse
> result = db.queryByExample(house);
if (result.isEmpty()) {
if (result.isEmpty()) {
- db.store(rh);
+ Owner ow = (Owner) db.queryByExample(rh.getOwner()).get(0);
+ db.delete(ow);
+ ow.addRuralHouse(rh);
+ db.store(ow);
db.commit();
stored = true;
} else {
db.commit();
stored = true;
} else {
@@
-488,6
+491,7
@@
public class DB4oManager {
if (!rhs.isEmpty()) {
Owner found = result.get(0);
found.getRuralHouses().remove(rhs.get(0));
if (!rhs.isEmpty()) {
Owner found = result.get(0);
found.getRuralHouses().remove(rhs.get(0));
+ db.delete(rhs.get(0));
db.store(found);
db.commit();
}
db.store(found);
db.commit();
}