Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses / src / businessLogic / AdminManager.java

diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java
index 7c827ae..f2790a9 100644 (file)
--- a/ruralHouses/src/businessLogic/AdminManager.java
+++ b/ruralHouses/src/businessLogic/AdminManager.java
@@ -1,31 +1,92 @@
 package businessLogic;
 
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
 import java.util.Vector;
 
-import domain.RuralHouse;
+import common.AdminInterface;
+
+import domain.Account;
 import domain.Administrator;
+import domain.RuralHouse;
 
-public class AdminManager {
-       public AdminManager (){
-               
+public class AdminManager extends UnicastRemoteObject implements AdminInterface {
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
+
+
+
+
+       public AdminManager() throws RemoteException {
+
+       }
+
+       public Vector<RuralHouse> getAdditionRequests() throws RemoteException {
+               return new Vector<RuralHouse>(Administrator.getInstance()
+                               .getAddRequest());
+       }
+
+       public Vector<RuralHouse> getDeletionRequests() throws RemoteException {
+               return new Vector<RuralHouse>(Administrator.getInstance()
+                               .getRemoveRequest());
+       }
+
+       public Vector<Account> getOwnerAdditionRequests() throws RemoteException {
+               return new Vector<Account>(Administrator.getInstance()
+                               .getNewOwnerRequest());
+       }
+       
+       public void removeHouseAdditionRequests(RuralHouse house) throws RemoteException {
+               Administrator.getInstance().getAddRequest().remove(house);
        }
-       public Vector<RuralHouse> getAdditionRequests(){
-               return new Vector<RuralHouse>(Administrator.getAddRequest());
+
+       public void removeHouseDeletionRequests(RuralHouse house) throws RemoteException {
+               Administrator.getInstance().getRemoveRequest().remove(house);
        }
        
-       public Vector<RuralHouse> getDeletionRequests(){
-               return new Vector<RuralHouse>(Administrator.getRemoveRequest());
+       public void removeOwnerAdditionRequests(Account acc) throws RemoteException {
+               Administrator.getInstance().getNewOwnerRequest().remove(acc);
        }
-       public void removeHouseAdditionRequests(RuralHouse house){
-               Administrator.getAddRequest().remove(house);
+       
+       public boolean addAdditionRequest(RuralHouse rh) throws RemoteException {
+               if (this.getAdditionRequests().contains(rh)) {
+                       return false;
+               }
+               return Administrator.getInstance().getAddRequest().add(rh);
+
        }
-       public void removeHouseDeletionRequests(RuralHouse house){
-               Administrator.getRemoveRequest().remove(house);
+
+       public boolean addDeletionRequest(RuralHouse rh) throws RemoteException {
+               if (this.getDeletionRequests().contains(rh))
+                       return false;
+
+               return Administrator.getInstance().getRemoveRequest().add(rh);
+
+       }
+       
+       
+
+       
+       public boolean addAccount(Account acc) throws RemoteException {
+               if (this.getOwnerAdditionRequests().contains(acc)) {
+                       return false;
                }
-       public void addAdditionRequest(RuralHouse rh){
-               Administrator.getAddRequest().add(rh);
+               return Administrator.getInstance().getNewOwnerRequest().add(acc);
        }
-       public void addDeletionRequest(RuralHouse rh){
-               Administrator.getRemoveRequest().add(rh);
+
+       @Override
+       public void saveInstance() throws RemoteException {
+               Administrator.saveInstance();
+               
        }
+
+
+
+//     public boolean removeAccount(Account acc) {
+//             if (this.getDeletionRequests().contains(acc))
+//                     return false;
+//             return Administrator.getInstance().getNewOwnerRequest().add(acc);
+//     }
 }