Created Account class to separate identification from the Owner

diff --git a/ruralHouses/db/DBjcampos004.yap b/ruralHouses/db/DBjcampos004.yap
new file mode 100644 (file)
index 0000000..27d41f6
Binary files /dev/null and b/ruralHouses/db/DBjcampos004.yap differ

diff --git a/ruralHouses/src/businessLogic/LoginManager.java b/ruralHouses/src/businessLogic/LoginManager.java
index 9710fec..da6078b 100644 (file)
--- a/ruralHouses/src/businessLogic/LoginManager.java
+++ b/ruralHouses/src/businessLogic/LoginManager.java
@@ -6,6 +6,7 @@ import java.rmi.RemoteException;
 import java.util.Vector;
 
 import dataAccess.DB4oManager;
 import java.util.Vector;
 
 import dataAccess.DB4oManager;

+import domain.Account;

 import domain.Owner;
 
 public class LoginManager implements LoginManagerInterface {
 import domain.Owner;
 
 public class LoginManager implements LoginManagerInterface {


@@ -27,9 +28,9 @@ public class LoginManager implements LoginManagerInterface {
        @Override
        public Owner checkCredentials(String usr, String pwd) {
                try {
        @Override
        public Owner checkCredentials(String usr, String pwd) {
                try {

-                       Vector<Owner> owner = dbMngr.getSingleOwner(usr, pwd);
-                       if(owner.isEmpty()) return null;
-                       else return owner.get(0);
+                       Vector<Account> account = dbMngr.getAccount(usr, pwd);
+                       if(account.isEmpty()) return null;
+                       else return account.get(0).getOwner();

                        
                } catch (Exception e) {
                        // TODO Auto-generated catch block
                        
                } catch (Exception e) {
                        // TODO Auto-generated catch block

diff --git a/ruralHouses/src/configuration/Config.java b/ruralHouses/src/configuration/Config.java
index 164bca9..0ddca0f 100644 (file)
--- a/ruralHouses/src/configuration/Config.java
+++ b/ruralHouses/src/configuration/Config.java
@@ -13,7 +13,7 @@ public class Config {
        private final  String db4oFilename = "db/DBjcampos004.yap";
 
        //Two possible values: "open" or "initialize"
        private final  String db4oFilename = "db/DBjcampos004.yap";
 
        //Two possible values: "open" or "initialize"

-       private final String dataBaseOpenMode="open";
+       private final String dataBaseOpenMode="initialize";

 
        private static Config theInstance = new Config();
    
 
        private static Config theInstance = new Config();
    

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index 8388435..6d55e8d 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -7,16 +7,13 @@ import java.util.Vector;
 //import java.util.Enumeration;
 //import java.util.Vector;
 
 //import java.util.Enumeration;
 //import java.util.Vector;
 

+

 import businessLogic.BookingManager;
 
 import com.db4o.*;
 
 import configuration.Config;
 import businessLogic.BookingManager;
 
 import com.db4o.*;
 
 import configuration.Config;

-
-import domain.Booking;
-import domain.Offer;
-import domain.Owner;
-import domain.RuralHouse;
+import domain.*;

 import exceptions.OfferCanNotBeBooked;
 
 public class DB4oManager { 
 import exceptions.OfferCanNotBeBooked;
 
 public class DB4oManager { 


@@ -42,17 +39,20 @@ public class DB4oManager {
                        new File(db4oFileName).delete();
                        db=Db4o.openFile(Db4o.newConfiguration(), db4oFileName);
                        db.ext().configure().updateDepth(5);
                        new File(db4oFileName).delete();
                        db=Db4o.openFile(Db4o.newConfiguration(), db4oFileName);
                        db.ext().configure().updateDepth(5);

-                       Owner jon = new Owner("Jon", "userJon", "passJon");
-                       Owner alfredo = new Owner("Alfredo","userAlfredo", "passAlfredo");
+                       Owner jon = new Owner("Jon");
+                       Owner alfredo = new Owner("Alfredo");

                        jon.addRuralHouse(1, "Ezkioko etxea","Ezkio");
                        jon.addRuralHouse(2, "Eskiatzeko etxea","Jaca");
                        jon.setBankAccount("1349 5677 21 2133567777");
                        alfredo.addRuralHouse(3, "Casa del abuelo","Pitillas");
                        alfredo.addRuralHouse(4, "Refugio","Murgia");
                        alfredo.setBankAccount("4144 0087 23 9700002133");
                        jon.addRuralHouse(1, "Ezkioko etxea","Ezkio");
                        jon.addRuralHouse(2, "Eskiatzeko etxea","Jaca");
                        jon.setBankAccount("1349 5677 21 2133567777");
                        alfredo.addRuralHouse(3, "Casa del abuelo","Pitillas");
                        alfredo.addRuralHouse(4, "Refugio","Murgia");
                        alfredo.setBankAccount("4144 0087 23 9700002133");

-
+                       Account jonAcc = new Account("userJon", "passJon",jon);
+                       Account alfredoAcc = new Account("userAlfredo", "passAlfredo",alfredo);

                        db.store(jon);
                        db.store(alfredo);
                        db.store(jon);
                        db.store(alfredo);

+                       db.store(jonAcc);
+                       db.store(alfredoAcc);

                        db.commit();
                        System.out.println("DataBase Initialized");
                }
                        db.commit();
                        System.out.println("DataBase Initialized");
                }


@@ -75,7 +75,7 @@ public class DB4oManager {
                ObjectContainer db=DB4oManager.getContainer();
 
                try {
                ObjectContainer db=DB4oManager.getContainer();
 
                try {

-                       Owner proto = new Owner(null,null,null,null);
+                       Owner proto = new Owner(null,null);

                        ObjectSet result = db.queryByExample(proto);
                        Vector<Owner> owners=new Vector<Owner>();
                        while(result.hasNext())                          
                        ObjectSet result = db.queryByExample(proto);
                        Vector<Owner> owners=new Vector<Owner>();
                        while(result.hasNext())                          


@@ -86,17 +86,17 @@ public class DB4oManager {
                }
        } 
        
                }
        } 
        

-       public Vector<Owner> getSingleOwner(String usr, String pwd) throws RemoteException,
+       public Vector<Account> getAccount(String usr, String pwd) throws RemoteException,

        Exception {
                ObjectContainer db=DB4oManager.getContainer();
 
                try {
        Exception {
                ObjectContainer db=DB4oManager.getContainer();
 
                try {

-                       Owner proto = new Owner(null,usr,pwd,null);
+                       Account proto = new Account(usr,pwd, new Owner(null,null));

                        ObjectSet result = db.queryByExample(proto);
                        ObjectSet result = db.queryByExample(proto);

-                       Vector<Owner> owners=new Vector<Owner>();
+                       Vector<Account> accounts=new Vector<Account>();

                        while(result.hasNext())                          
                        while(result.hasNext())                          

-                               owners.add((Owner)result.next());
-                       return owners;
+                               accounts.add((Account)result.next());
+                       return accounts;

                } finally {
                        //db.close();
                }
                } finally {
                        //db.close();
                }

diff --git a/ruralHouses/src/domain/Account.java b/ruralHouses/src/domain/Account.java
new file mode 100644 (file)
index 0000000..f6f6460
--- /dev/null
+++ b/ruralHouses/src/domain/Account.java
@@ -0,0 +1,32 @@
+package domain;
+
+public class Account {
+
+       
+
+       private String username="";
+       private String password="";
+       private Owner owner;
+       
+       public Account (String usr, String pass, Owner ow){
+               this.username = usr;
+               this.password= pass;
+               this.owner= ow;
+               
+       }
+
+       public String getUsername() {
+               return username;
+       }
+
+       public String getPassword() {
+               return password;
+       }
+
+       public Owner getOwner() {
+               return owner;
+       }
+       
+
+       
+}

diff --git a/ruralHouses/src/domain/Owner.java b/ruralHouses/src/domain/Owner.java
index 34255f8..35f390c 100644 (file)
--- a/ruralHouses/src/domain/Owner.java
+++ b/ruralHouses/src/domain/Owner.java
@@ -8,22 +8,16 @@ public class Owner implements Serializable {
 
        private String bankAccount = "";
        private String name="";
 
        private String bankAccount = "";
        private String name="";

-       private String username="";
-       private String password="";

        private Vector<RuralHouse> ruralHouses;
 
        private Vector<RuralHouse> ruralHouses;
 

-       public Owner(String name,String login, String password) {
+       public Owner(String name) {

                this.name=name;
                this.name=name;

-               this.username=login;
-               this.password=password;

                ruralHouses=new Vector<RuralHouse>();           
        }
 
                ruralHouses=new Vector<RuralHouse>();           
        }
 

-       public Owner(String name,String login, String password, String bankAccount) {
+       public Owner(String name, String bankAccount) {

                this.bankAccount=bankAccount;
                this.name=name;
                this.bankAccount=bankAccount;
                this.name=name;

-               this.username=login;
-               this.password=password;

                ruralHouses=new Vector<RuralHouse>();           
        }
 
                ruralHouses=new Vector<RuralHouse>();           
        }
 


@@ -43,22 +37,6 @@ public class Owner implements Serializable {
                this.bankAccount = bankAccount;
        }
 
                this.bankAccount = bankAccount;
        }
 

-       public String getUsername() {
-               return this.username;
-       }
-
-       public void setUsername(String username) {
-               this.username = username;
-       }
-
-       public String getPassword() {
-               return this.password;
-       }
-
-       public void setPassword(String password) {
-               this.password = password;
-       }
-

        public Vector<RuralHouse> getRuralHouses() {
                return ruralHouses;
        }
        public Vector<RuralHouse> getRuralHouses() {
                return ruralHouses;
        }