RRRRHHHH_Code

URLs

Explore

Commits

Diff Revisions 2ac167 ... vs 0f75b2 ... for ruralHouses/src/domain/Administrator.java

		@@ -2,34 +2,45 @@
2	2
3	3		import java.util.LinkedList;
4	4
	5	+	import configuration.ConfigXML;
5	6		import dataAccess.DB4oManager;
6	7
7	8		public class Administrator {
8	9
	10	+	private static Administrator admin = null;
9	11		private static LinkedList<RuralHouse> addRequest;
10	12		private static LinkedList<RuralHouse> removeRequest;
11		-	private Administrator(){
	13	+	private static LinkedList<Owner> newOwnerRequest;
	14	+	static ConfigXML c;
	15	+
	16	+	private Administrator() {
12	17		addRequest = new LinkedList<RuralHouse>();
13		-	removeRequest = new LinkedList<RuralHouse>();
	18	+	removeRequest = new LinkedList<RuralHouse>();
	19	+	newOwnerRequest = new LinkedList<Owner>();
14	20		}
15	21
16		-	public static Administrator giveAdmin(){
17		-	return new Administrator();
18		-	}
19		-
20		-	public static void getInstance(){
21		-	try {
22		-	DB4oManager db4o = DB4oManager.getInstance();
23		-	LinkedList<RuralHouse>[] temp = db4o.getAdminData();
24		-	addRequest = temp[0];
25		-	removeRequest = temp[1];
26		-	} catch (Exception e) {
27		-	e.printStackTrace();
	22	+	public static Administrator getInstance() {
	23	+	c = ConfigXML.getInstance();
	24	+	if (admin == null) {
	25	+	if (c.getDataBaseOpenMode().equals("initialize")) {
	26	+	admin = new Administrator();
	27	+	} else {
	28	+	DB4oManager db4o;
	29	+	try {
	30	+	db4o = DB4oManager.getInstance();
	31	+	admin = db4o.getAdminData();
	32	+	} catch (Exception e) {
	33	+	// TODO Auto-generated catch block
	34	+	e.printStackTrace();
	35	+	}
	36	+	}
28	37		}
29	38
	39	+	return admin;
	40	+
30	41		}
31		-
32		-	public static void saveInstance(){
	42	+
	43	+	public static void saveInstance() {
33	44		try {
34	45		DB4oManager.getInstance().storeAdmin();
35	46		} catch (Exception e) {
		@@ -37,20 +48,29 @@
37	48		e.printStackTrace();
38	49		}
39	50		}
40		-
41		-	public static LinkedList<RuralHouse> getAddRequest() {
	51	+
	52	+	public LinkedList<RuralHouse> getAddRequest() {
42	53		return addRequest;
43	54		}
44		-	public static LinkedList<RuralHouse> getRemoveRequest() {
	55	+
	56	+	public LinkedList<RuralHouse> getRemoveRequest() {
45	57		return removeRequest;
46	58		}
47	59
48		-	public static void setAddRequest(LinkedList<RuralHouse> addRequest) {
	60	+	public void setAddRequest(LinkedList<RuralHouse> addRequest) {
49	61		Administrator.addRequest = addRequest;
50	62		}
51	63
52		-	public static void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
	64	+	public void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
53	65		Administrator.removeRequest = removeRequest;
54	66		}
55	67
	68	+	public LinkedList<Owner> getNewOwnerRequest() {
	69	+	return newOwnerRequest;
	70	+	}
	71	+
	72	+	public void setNewOwnerRequest(LinkedList<Owner> newOwnerRequest) {
	73	+	Administrator.newOwnerRequest = newOwnerRequest;
	74	+	}
	75	+
56	76		}

View View this file contents

History View the full history

Feeds

Commits for ruralHouses/src/domain/Administrator.java