RRRRHHHH_Code

Explore

Commits

Diff Revisions 6a5d4d ... vs 4f8bcc ... for ruralHouses/src/dataAccess/DB4oManager.java

		@@ -135,8 +135,10 @@
135	135		Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
136	136		alfredo);
137	137
	138	+
138	139		Account admin = new Account("admin", "admin", true);
139	140		db.store(Administrator.getInstance());
	141	+
140	142		db.store(jonAcc);
141	143		db.store(alfredoAcc);
142	144		db.store(admin);
		@@ -219,7 +221,9 @@
219	221		}
220	222		}
221	223
222		-	public Administrator getAdminData() {
	224	+
	225	+
	226	+	public Administrator getAdminData(){
223	227		if (c.isDatabaseLocal() == false)
224	228		openSDB();
225	229		else
		@@ -227,10 +231,8 @@
227	231
228	232		try {
229	233
230		-	List<Administrator> admL = db.query(new Predicate<Administrator>() {
231		-	/**
232		-	*
233		-	*/
	234	+
	235	+	List<Administrator> admL = db.query(new Predicate<Administrator>(){
234	236		private static final long serialVersionUID = 1L;
235	237
236	238		public boolean match(Administrator admin) {
		@@ -238,8 +240,11 @@
238	240		}
239	241		});
240	242
	243	+
	244	+
241	245		return admL.get(0);
242		-	} finally {
	246	+	}
	247	+	finally {
243	248		db.close();
244	249
245	250		}
		@@ -247,6 +252,7 @@
247	252		}
248	253
249	254		public void storeAdmin() {
	255	+
250	256		if (c.isDatabaseLocal() == false)
251	257		openSDB();
252	258		else
		@@ -270,6 +276,7 @@
270	276		Administrator.getInstance().getRemoveRequest());
271	277		admL.get(0).setNewOwnerRequest(
272	278		Administrator.getInstance().getNewOwnerRequest());
	279	+
273	280		db.commit();
274	281
275	282		} catch (Exception e) {