Merge conflicts solutioned

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

diff --git a/ruralHouses/src/businessLogic/AccountManager.java b/ruralHouses/src/businessLogic/AccountManager.java
index 6f3b626..3f0bc5b 100644 (file)
--- a/ruralHouses/src/businessLogic/AccountManager.java
+++ b/ruralHouses/src/businessLogic/AccountManager.java
@@ -1,14 +1,24 @@
 package businessLogic;
 
+import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
+
+import javax.mail.MessagingException;
+
+import common.AccountInterface;
 import dataAccess.DB4oManager;
 import domain.Account;
 
-public class AccountManager {
+public class AccountManager extends UnicastRemoteObject implements AccountInterface {
        
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        private DB4oManager dbMngr;
        
        
-       public AccountManager() {
+       public AccountManager() throws RemoteException {
                try {
                        dbMngr = DB4oManager.getInstance();
                } catch (Exception e) {
@@ -17,14 +27,20 @@ public class AccountManager {
                }
        }
        
-       public boolean addAccount(Account ac){
-               if(this.dbMngr.addAccount(ac))
+       public boolean addAccount(Account ac) throws RemoteException {
+               if(this.dbMngr.addAccount(ac)){
+                       try {
+                               MailManager.getInstance().Send(ac.getOwner().getMailAccount(), "Entered into the system", "Congratulations");
+                       } catch (MessagingException e) {
+                               e.printStackTrace();
+                       }
                        return true;
+                       }
                return false;
                
        }
        
-       public boolean removeAccount(Account ac){
+       public boolean removeAccount(Account ac)throws RemoteException {
                if(this.dbMngr.removeAccount(ac))
                        return true;
                return false;