Created Account class to separate identification from the Owner

[RRRRHHHH_Code] / ruralHouses / src / dataAccess / DB4oManager.java

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 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 { 
@@ -42,17 +39,20 @@ public class DB4oManager {
                        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");
-
+                       Account jonAcc = new Account("userJon", "passJon",jon);
+                       Account alfredoAcc = new Account("userAlfredo", "passAlfredo",alfredo);
                        db.store(jon);
                        db.store(alfredo);
+                       db.store(jonAcc);
+                       db.store(alfredoAcc);
                        db.commit();
                        System.out.println("DataBase Initialized");
                }
@@ -75,7 +75,7 @@ public class DB4oManager {
                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())                          
@@ -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 {
-                       Owner proto = new Owner(null,usr,pwd,null);
+                       Account proto = new Account(usr,pwd, new Owner(null,null));
                        ObjectSet result = db.queryByExample(proto);
-                       Vector<Owner> owners=new Vector<Owner>();
+                       Vector<Account> accounts=new Vector<Account>();
                        while(result.hasNext())                          
-                               owners.add((Owner)result.next());
-                       return owners;
+                               accounts.add((Account)result.next());
+                       return accounts;
                } finally {
                        //db.close();
                }