Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

[RRRRHHHH_Code] / ruralHouses / src / domain / Administrator.java

diff --git a/ruralHouses/src/domain/Administrator.java b/ruralHouses/src/domain/Administrator.java
index 9efed03..eb42f26 100644 (file)
--- a/ruralHouses/src/domain/Administrator.java
+++ b/ruralHouses/src/domain/Administrator.java
@@ -1,22 +1,28 @@
 package domain;
 
+import java.io.Serializable;
 import java.util.LinkedList;
 
 import configuration.ConfigXML;
 import dataAccess.DB4oManager;
 
-public class Administrator {
+public class Administrator implements Serializable {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
 
        private static Administrator admin = null;
        private static LinkedList<RuralHouse> addRequest;
        private static LinkedList<RuralHouse> removeRequest;
-       private static LinkedList<Owner> newOwnerRequest;
+       private static LinkedList<Account> newOwnerRequest;
        static ConfigXML c;
 
        private Administrator() {
                addRequest = new LinkedList<RuralHouse>();
                removeRequest = new LinkedList<RuralHouse>();
-               newOwnerRequest = new LinkedList<Owner>();
+               newOwnerRequest = new LinkedList<Account>();
        }
 
        public static Administrator getInstance() {
@@ -49,6 +55,7 @@ public class Administrator {
                }
        }
 
+       
        public LinkedList<RuralHouse> getAddRequest() {
                return addRequest;
        }
@@ -63,13 +70,14 @@ public class Administrator {
 
        public void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
                Administrator.removeRequest = removeRequest;
+
        }
 
-       public LinkedList<Owner> getNewOwnerRequest() {
+       public LinkedList<Account> getNewOwnerRequest() {
                return newOwnerRequest;
        }
 
-       public void setNewOwnerRequest(LinkedList<Owner> newOwnerRequest) {
+       public void setNewOwnerRequest(LinkedList<Account> newOwnerRequest) {
                Administrator.newOwnerRequest = newOwnerRequest;
        }