RRRRHHHH_Code

Explore

Commits

Diff Revisions be3833 ... vs 3db092 ... for ruralHouses/src/dataAccess/DB4oManager.java

		@@ -516,7 +516,14 @@
516	516		public Vector<RuralHouse> getRuralHouses(Owner ow, String name,
517	517		String town, int nBed, int nKit, int nBath, int nPark, int nLiv) {
518	518		HouseFeatures fea = new HouseFeatures(nBed, nKit, nBath, nLiv, nPark);
519		-	RuralHouse rh = new RuralHouse(name, ow, null, town, fea);
	519	+	RuralHouse rh;
	520	+	if (ow != null) {
	521	+	Owner own = new Owner(ow.getName(), ow.getBankAccount(),
	522	+	ow.getMailAccount());
	523	+	rh = new RuralHouse(name, own, null, town, fea);
	524	+	}else{
	525	+	rh = new RuralHouse(name, ow, null, town, fea);
	526	+	}
520	527		if (c.isDatabaseLocal() == false)
521	528		openSDB();
522	529		else
		@@ -632,7 +639,9 @@
632	639
633	640		try {
634	641		Offer of = (Offer) db.queryByExample(
635		-	new Offer(0, o.getRuralHouse(), null, null, 0)).get(0);
	642	+	new Offer(o.getOfferNumber(), new RuralHouse(o
	643	+	.getRuralHouse().getHouseName(), null, null, null,
	644	+	null), null, null, 0)).get(0);
636	645		Booking proto = new Booking(0, of, null, null);
637	646		ObjectSet<Booking> result = db.queryByExample(proto);
638	647		return new Vector<Booking>(result);