RRRRHHHH_Code

Explore

Commits

Diff Revisions c92b61 ... vs d30bcc ... for ruralHouses/src/dataAccess/DB4oManager.java

		@@ -319,12 +319,12 @@
319	319		openSDB();
320	320
321	321		RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(), null,
322		-	ruralHouse.getDescription(), ruralHouse.getDistrict(), null);
	322	+	null, null, null);
323	323		ObjectSet<RuralHouse> result = db.queryByExample(proto);
324	324		RuralHouse rh = (RuralHouse) result.next();
325	325
326	326		Offer offer;
327		-	offer = rh.findOffer(firstDate, lastDate);
	327	+	offer = (Offer)db.queryByExample(new Offer(0, rh, firstDate, lastDate, 0)).get(0);
328	328
329	329		if (offer != null) {
330	330		offer.createBooking(theDB4oManagerAux.bookingNumber++, cl);
		@@ -371,24 +371,6 @@
371	371		}
372	372		}
373	373
374		-
375		-	public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
376		-	Exception {
377		-
378		-	if (c.isDatabaseLocal() == false)
379		-	openSDB();
380		-	else
381		-	openDB();
382		-
383		-	try {
384		-	RuralHouse proto = new RuralHouse(null, null, null, null, null);
385		-	ObjectSet<RuralHouse> result = db.queryByExample(proto);
386		-	return new Vector<RuralHouse>(result);
387		-	} finally {
388		-	db.close();
389		-	}
390		-	}
391		-
392	374		public boolean existsOverlappingOffer(RuralHouse rh, Date firstDay,
393	375		Date lastDay) throws RemoteException, OverlappingOfferExists {
394	376
		@@ -411,10 +393,6 @@
411	393		}
412	394		}
413	395
414		-	public static ObjectContainer getContainer() {
415		-	return db;
416		-	}
417		-
418	396		public void close() {
419	397		db.close();
420	398		System.out.println("DataBase closed");