RRRRHHHH_Code

URLs

Explore

Commits

Diff Revisions 578bec ... vs ad3773 ... for ruralHouses/src/dataAccess/DB4oManager.java

		@@ -220,7 +220,21 @@
220	220		}
221	221		}
222	222
	223	+	public Vector<Offer> getRHsOffer(String name){
	224	+	if (c.isDatabaseLocal() == false)
	225	+	openSDB();
	226	+	else
	227	+	openDB();
223	228
	229	+	try {
	230	+	RuralHouse rh = (RuralHouse)db.queryByExample(new RuralHouse(name, null, null, null, null)).get(0);
	231	+	Offer proto = new Offer(0, rh, null, null, 0);
	232	+	ObjectSet<Offer> result = db.queryByExample(proto);
	233	+	return new Vector<Offer>(result);
	234	+	} finally {
	235	+	db.close();
	236	+	}
	237	+	}
224	238
225	239		public Administrator getAdminData(){
226	240		if (c.isDatabaseLocal() == false)
		@@ -361,6 +375,7 @@
361	375		}
362	376		}
363	377
	378	+
364	379		public Vector<RuralHouse> getAllRuralHouses() throws RemoteException,
365	380		Exception {
366	381
		@@ -372,10 +387,7 @@
372	387		try {
373	388		RuralHouse proto = new RuralHouse(null, null, null, null, null);
374	389		ObjectSet<RuralHouse> result = db.queryByExample(proto);
375		-	Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
376		-	while (result.hasNext())
377		-	ruralHouses.add((RuralHouse) result.next());
378		-	return ruralHouses;
	390	+	return new Vector<RuralHouse>(result);
379	391		} finally {
380	392		db.close();
381	393		}
		@@ -500,10 +512,10 @@
500	512
501	513		}
502	514
503		-	public Vector<RuralHouse> getRuralHouses(String name, String town,
	515	+	public Vector<RuralHouse> getRuralHouses(Owner ow, String name, String town,
504	516		int nBed, int nKit, int nBath, int nPark, int nLiv) {
505	517		HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
506		-	RuralHouse rh = new RuralHouse(name, null, null, town, fea);
	518	+	RuralHouse rh = new RuralHouse(name, ow, null, town, fea);
507	519		if (c.isDatabaseLocal() == false)
508	520		openSDB();
509	521		else

View View this file contents

History View the full history

Feeds

Commits for ruralHouses/src/dataAccess/DB4oManager.java