X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/blobdiff_plain/46d6c37bf669afa1ddb7176d857fd17af0ff3e4f..520867d5e278316fe874703c30b89de67ff5d82d:/ruralHouses/src/dataAccess/DB4oManager.java

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index eb80b86..0e6e881 100644
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -4,15 +4,12 @@ import java.io.File;
 //import java.util.Enumeration;
 //import java.util.Vector;
 import java.rmi.RemoteException;
-
-
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Vector;
 
-
 import com.db4o.Db4oEmbedded;
 import com.db4o.ObjectContainer;
 import com.db4o.ObjectSet;
@@ -72,8 +69,8 @@ public class DB4oManager {
 		} else // c.getDataBaseOpenMode().equals("open")
 
 		{
-			ObjectSet res = db.queryByExample(DB4oManagerAux.class);
-			ListIterator listIter = res.listIterator();
+			ObjectSet<DB4oManagerAux> res = db.queryByExample(DB4oManagerAux.class);
+			ListIterator<DB4oManagerAux> listIter = res.listIterator();
 			if (listIter.hasNext())
 				theDB4oManagerAux = (DB4oManagerAux) res.next();
 		}
@@ -155,8 +152,7 @@ public class DB4oManager {
 
 		try {
 			Owner proto = new Owner(null, null);
-			ObjectSet result = db.queryByExample(proto);
-			Vector<Owner> owners = new Vector<Owner>();
+			ObjectSet<Owner> result = db.queryByExample(proto);
 			while (result.hasNext()) {
 				Owner o = (Owner) result.next();
 				System.out.println("Deleted owner: " + o.toString());
@@ -223,16 +219,23 @@ public class DB4oManager {
 	}
 
 	
+	@SuppressWarnings("static-access")
 	public LinkedList<RuralHouse>[] getAdminData(){
 		if (c.isDatabaseLocal() == false)
 			openSDB();
 		else
 			openDB();
+		@SuppressWarnings("unchecked")
 		LinkedList<RuralHouse>[] ret =  new LinkedList[2];
 		
 		try {
 			
 			List<Administrator> admL = db.query(new Predicate<Administrator>(){
+				/**
+				 * 
+				 */
+				private static final long serialVersionUID = 1L;
+
 				public boolean match(Administrator admin){
 					return true;
 				}
@@ -249,6 +252,7 @@ public class DB4oManager {
 		
 	}
 	
+	@SuppressWarnings("static-access")
 	public void storeAdmin() {
 		if (c.isDatabaseLocal() == false)
 			openSDB();
@@ -257,6 +261,11 @@ public class DB4oManager {
 		try {
 			
 			List<Administrator> admL = db.query(new Predicate<Administrator>(){
+				/**
+				 * 
+				 */
+				private static final long serialVersionUID = 1L;
+
 				public boolean match(Administrator admin){
 					return true;
 				}
@@ -304,7 +313,7 @@ public class DB4oManager {
 
 			RuralHouse proto = new RuralHouse(ruralHouse.getHouseName(), null,
 					ruralHouse.getDescription(), ruralHouse.getDistrict(), null);
-			ObjectSet result = db.queryByExample(proto);
+			ObjectSet<RuralHouse> result = db.queryByExample(proto);
 			RuralHouse rh = (RuralHouse) result.next();
 
 			Offer offer;
@@ -364,7 +373,7 @@ public class DB4oManager {
 
 		try {
 			RuralHouse proto = new RuralHouse(null, null, null, null, null);
-			ObjectSet result = db.queryByExample(proto);
+			ObjectSet<RuralHouse> result = db.queryByExample(proto);
 			Vector<RuralHouse> ruralHouses = new Vector<RuralHouse>();
 			while (result.hasNext())
 				ruralHouses.add((RuralHouse) result.next());