RuralHouses(willCodeForFood)
Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions d7fd17 ... vs 0f75b2 ... for ruralHouses/src/dataAccess/DB4oManager.java

Diff revisions: vs.
  @@ -69,7 +69,8 @@
69 69 } else // c.getDataBaseOpenMode().equals("open")
70 70
71 71 {
72 - ObjectSet<DB4oManagerAux> res = db.queryByExample(DB4oManagerAux.class);
72 + ObjectSet<DB4oManagerAux> res = db
73 + .queryByExample(DB4oManagerAux.class);
73 74 ListIterator<DB4oManagerAux> listIter = res.listIterator();
74 75 if (listIter.hasNext())
75 76 theDB4oManagerAux = (DB4oManagerAux) res.next();
  @@ -82,7 +83,8 @@
82 83 configuration.common().updateDepth(c.getUpdateDepth());
83 84 configuration.common().objectClass(Owner.class).cascadeOnUpdate(true);
84 85 configuration.common().objectClass(Owner.class).cascadeOnDelete(true);
85 - configuration.common().objectClass(RuralHouse.class).cascadeOnUpdate(true);
86 + configuration.common().objectClass(RuralHouse.class)
87 + .cascadeOnUpdate(true);
86 88 configuration.common().objectClass(Account.class).cascadeOnUpdate(true);
87 89 db = Db4oEmbedded.openFile(configuration, c.getDb4oFilename());
88 90 }
  @@ -126,21 +128,21 @@
126 128 jon.setBankAccount("1349 5677 21 2133567777");
127 129 alfredo.addRuralHouse("Aitonako", "Casa del abuelo", "Vegas", 5, 5,
128 130 5, 5, 5);
129 -
131 +
130 132 alfredo.addRuralHouse("Murgoitz", "", "Cedro", 6, 6, 6, 6, 6);
131 133 alfredo.setBankAccount("4144 0087 23 9700002133");
132 134 Account jonAcc = new Account("1", "1", jon);
133 135 Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
134 136 alfredo);
135 137
136 - Account admin = new Account("admin","admin", true);
137 - db.store(Administrator.giveAdmin());
138 + Account admin = new Account("admin", "admin", true);
139 + db.store(Administrator.getInstance());
138 140 db.store(jonAcc);
139 141 db.store(alfredoAcc);
140 142 db.store(admin);
141 143 db.commit();
142 144 } finally {
143 - db.close();
145 + db.close();
144 146 }
145 147 }
146 148
  @@ -196,9 +198,7 @@
196 198 return o;
197 199 }
198 200
199 -
200 - public void deleteOffer(Offer offer) throws RemoteException,
201 - Exception {
201 + public void deleteOffer(Offer offer) throws RemoteException, Exception {
202 202 if (c.isDatabaseLocal() == false)
203 203 openSDB();
204 204 else
  @@ -206,7 +206,7 @@
206 206
207 207 try {
208 208 ObjectSet<Offer> of = db.queryByExample(offer);
209 - RuralHouse rh =of.get(0).getRuralHouse();
209 + RuralHouse rh = of.get(0).getRuralHouse();
210 210 System.out.println(rh.offers.remove(of.get(0)));
211 211 db.store(rh);
212 212 db.commit();
  @@ -219,75 +219,67 @@
219 219 }
220 220 }
221 221
222 -
223 - @SuppressWarnings("static-access")
224 - public LinkedList<RuralHouse>[] getAdminData(){
222 +
223 + public Administrator getAdminData() {
225 224 if (c.isDatabaseLocal() == false)
226 225 openSDB();
227 226 else
228 227 openDB();
229 - @SuppressWarnings("unchecked")
230 - LinkedList<RuralHouse>[] ret = new LinkedList[2];
231 -
228 +
232 229 try {
233 -
234 - List<Administrator> admL = db.query(new Predicate<Administrator>(){
230 +
231 + List<Administrator> admL = db.query(new Predicate<Administrator>() {
235 232 /**
236 233 *
237 234 */
238 235 private static final long serialVersionUID = 1L;
239 236
240 - public boolean match(Administrator admin){
237 + public boolean match(Administrator admin) {
241 238 return true;
242 239 }
243 240 });
244 -
245 - ret[0] = admL.get(0).getAddRequest();
246 - ret[1] = admL.get(0).getRemoveRequest();
247 - return ret;
248 - }
249 - finally {
241 +
242 + return admL.get(0);
243 + } finally {
250 244 db.close();
251 -
245 +
252 246 }
253 -
247 +
254 248 }
255 -
249 +
256 250 @SuppressWarnings("static-access")
257 251 public void storeAdmin() {
258 252 if (c.isDatabaseLocal() == false)
259 253 openSDB();
260 254 else
261 - openDB();
255 + openDB();
262 256 try {
263 -
264 - List<Administrator> admL = db.query(new Predicate<Administrator>(){
257 +
258 + List<Administrator> admL = db.query(new Predicate<Administrator>() {
265 259 /**
266 260 *
267 261 */
268 262 private static final long serialVersionUID = 1L;
269 263
270 - public boolean match(Administrator admin){
264 + public boolean match(Administrator admin) {
271 265 return true;
272 266 }
273 267 });
268 +
274 269
275 - admL.get(0).setAddRequest(Administrator.getAddRequest());
276 - admL.get(0).setRemoveRequest(Administrator.getRemoveRequest());
270 + admL.get(0).setAddRequest(Administrator.getInstance().getAddRequest());
271 + admL.get(0).setRemoveRequest(Administrator.getInstance().getRemoveRequest());
272 + admL.get(0).setNewOwnerRequest(Administrator.getInstance().getNewOwnerRequest());
277 273 db.commit();
278 -
279 - }
280 - catch(Exception e){
281 -
282 - }
283 - finally {
274 +
275 + } catch (Exception e) {
276 +
277 + } finally {
284 278 db.close();
285 279 }
286 -
287 -
280 +
288 281 }
289 -
290 -
282 +
291 283 /**
292 284 * This method creates a book with a corresponding parameters
293 285 *
  @@ -305,7 +297,6 @@
305 297 openDB();
306 298
307 299 Booking bok = null;
308 -
309 300
310 301 try {
311 302
  @@ -421,12 +412,12 @@
421 412
422 413 /**
423 414 * @param usr
424 - * @param pwd
415 + * @param ps
425 416 * @return
426 417 * @throws RemoteException
427 418 * @throws Exception
428 419 */
429 - public Vector<Account> getAccount(String usr, String pwd)
420 + public Vector<Account> getAccount(Account proto)
430 421 throws RemoteException, Exception {
431 422
432 423 if (c.isDatabaseLocal() == false)
  @@ -435,7 +426,6 @@
435 426 openDB();
436 427
437 428 try {
438 - Account proto = new Account(usr, pwd, null);
439 429 ObjectSet<Account> result = db.queryByExample(proto);
440 430 Vector<Account> accounts = new Vector<Account>();
441 431 while (result.hasNext())
  @@ -490,7 +480,7 @@
490 480 ObjectSet<Owner> result = db.queryByExample(owner);
491 481 ObjectSet<RuralHouse> rhs = db.queryByExample(rh);
492 482 if (!rhs.isEmpty()) {
493 - Owner found = result.get(0);
483 + Owner found = result.get(0);
494 484 found.getRuralHouses().remove(rhs.get(0));
495 485 db.delete(rhs.get(0));
496 486 db.store(found);
  @@ -504,7 +494,6 @@
504 494
505 495 }
506 496
507 -
508 497 public Vector<RuralHouse> getRuralHouses(String name, String town,
509 498 int nBed, int nKit, int nBath, int nPark, int nLiv) {
510 499 HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
  @@ -527,5 +516,4 @@
527 516
528 517 }
529 518
530 -
531 519 }

View View this file contents

History View the full history

Feeds

Commits for ruralHouses/src/dataAccess/DB4oManager.java

Need assistance?   Get in touch, or head to our documentation site.