Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Diff Revisions e90cb4 ... vs 4bc36b ... for ruralHouses/src/dataAccess/DB4oManager.java

Diff revisions: vs.
  @@ -222,7 +222,24 @@
222 222 }
223 223 }
224 224
225 - public Administrator getAdminData() {
225 + public Vector<Offer> getRHsOffer(String name){
226 + if (c.isDatabaseLocal() == false)
227 + openSDB();
228 + else
229 + openDB();
230 +
231 + try {
232 + RuralHouse rh = (RuralHouse)db.queryByExample(new RuralHouse(name, null, null, null, null)).get(0);
233 + Offer proto = new Offer(0, rh, null, null, 0);
234 + ObjectSet<Offer> result = db.queryByExample(proto);
235 + return new Vector<Offer>(result);
236 + } finally {
237 + db.close();
238 + }
239 + }
240 +
241 + public Administrator getAdminData(){
242 +
226 243 if (c.isDatabaseLocal() == false)
227 244 openSDB();
228 245 else
  @@ -357,6 +374,7 @@
357 374 }
358 375 }
359 376
377 +
360 378 public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
361 379 Exception {
362 380
  @@ -368,10 +386,7 @@
368 386 try {
369 387 RuralHouse proto = new RuralHouse(null, null, null, null, null);
370 388 ObjectSet<RuralHouse> result = db.queryByExample(proto);
371 - Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
372 - while (result.hasNext())
373 - ruralHouses.add((RuralHouse) result.next());
374 - return ruralHouses;
389 + return new Vector<RuralHouse>(result);
375 390 } finally {
376 391 db.close();
377 392 }
  @@ -496,10 +511,10 @@
496 511
497 512 }
498 513
499 - public Vector<RuralHouse> getRuralHouses(String name, String town,
514 + public Vector<RuralHouse> getRuralHouses(Owner ow, String name, String town,
500 515 int nBed, int nKit, int nBath, int nPark, int nLiv) {
501 516 HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
502 - RuralHouse rh = new RuralHouse(name, null, null, town, fea);
517 + RuralHouse rh = new RuralHouse(name, ow, null, town, fea);
503 518 if (c.isDatabaseLocal() == false)
504 519 openSDB();
505 520 else