New owners now can be created properly.

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

diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java
index f2790a9..a344f2c 100644 (file)
--- a/ruralHouses/src/businessLogic/AdminManager.java
+++ b/ruralHouses/src/businessLogic/AdminManager.java
@@ -5,9 +5,9 @@ import java.rmi.server.UnicastRemoteObject;
 import java.util.Vector;
 
 import common.AdminInterface;
-
 import domain.Account;
 import domain.Administrator;
+import domain.Owner;
 import domain.RuralHouse;
 
 public class AdminManager extends UnicastRemoteObject implements AdminInterface {
@@ -46,8 +46,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 +66,12 @@ 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 +86,7 @@ public class AdminManager extends UnicastRemoteObject implements AdminInterface
 
 
 
+
 //     public boolean removeAccount(Account acc) {
 //             if (this.getDeletionRequests().contains(acc))
 //                     return false;