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

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

diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java
index f2790a9..a7e3a2a 100644 (file)
--- a/ruralHouses/src/businessLogic/AdminManager.java
+++ b/ruralHouses/src/businessLogic/AdminManager.java
@@ -6,8 +6,10 @@ import java.util.Vector;
 
 import common.AdminInterface;
 
+import dataAccess.DB4oManager;
 import domain.Account;
 import domain.Administrator;
+import domain.Owner;
 import domain.RuralHouse;
 
 public class AdminManager extends UnicastRemoteObject implements AdminInterface {
@@ -38,6 +40,14 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface
                                .getNewOwnerRequest());
        }
        
+       public Vector<Owner> getAllOwners()throws RemoteException {
+               try {
+                       return new Vector<Owner>(DB4oManager.getInstance().getOwners());
+               } catch (Exception e) {
+                       e.printStackTrace();
+               }
+               return null;
+       }
        public void removeHouseAdditionRequests(RuralHouse house) throws RemoteException {
                Administrator.getInstance().getAddRequest().remove(house);
        }
@@ -46,8 +56,8 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface
                Administrator.getInstance().getRemoveRequest().remove(house);
        }
        
-       public void removeOwnerAdditionRequests(Account acc) throws RemoteException {
-               Administrator.getInstance().getNewOwnerRequest().remove(acc);
+       public void removeOwnerAdditionRequests(int index) throws RemoteException {
+               Administrator.getInstance().getNewOwnerRequest().remove(index);
        }
        
        public boolean addAdditionRequest(RuralHouse rh) throws RemoteException {
@@ -66,10 +76,10 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface
 
        }
        
-       
-
-       
-       public boolean addAccount(Account acc) throws RemoteException {
+       public boolean addAccountRequest(String usr,
+                       String pss, Owner ow) throws RemoteException {
+               
+               Account acc = new Account (usr, pss,  ow);
                if (this.getOwnerAdditionRequests().contains(acc)) {
                        return false;
                }
@@ -84,6 +94,7 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface
 
 
 
+
 //     public boolean removeAccount(Account acc) {
 //             if (this.getDeletionRequests().contains(acc))
 //                     return false;