Merge conflicts solutioned

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

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index a541e95..b0513ae 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -135,8 +135,10 @@ public class DB4oManager {
                        Account alfredoAcc = new Account("userAlfredo", "passAlfredo",
                                        alfredo);
 
+
                        Account admin = new Account("admin", "admin", true);
                        db.store(Administrator.getInstance());
+
                        db.store(jonAcc);
                        db.store(alfredoAcc);
                        db.store(admin);
@@ -219,7 +221,9 @@ public class DB4oManager {
                }
        }
 
-       public Administrator getAdminData() {
+
+       
+       public Administrator getAdminData(){
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -227,10 +231,8 @@ public class DB4oManager {
 
                try {
 
-                       List<Administrator> admL = db.query(new Predicate<Administrator>() {
-                               /**
-                                * 
-                                */
+                       
+                       List<Administrator> admL = db.query(new Predicate<Administrator>(){
                                private static final long serialVersionUID = 1L;
 
                                public boolean match(Administrator admin) {
@@ -238,8 +240,11 @@ public class DB4oManager {
                                }
                        });
 
+                       
+                       
                        return admL.get(0);
-               } finally {
+               }
+               finally {
                        db.close();
 
                }
@@ -247,6 +252,7 @@ public class DB4oManager {
        }
 
        public void storeAdmin() {
+
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
@@ -270,6 +276,7 @@ public class DB4oManager {
                                        Administrator.getInstance().getRemoveRequest());
                        admL.get(0).setNewOwnerRequest(
                                        Administrator.getInstance().getNewOwnerRequest());
+
                        db.commit();
 
                } catch (Exception e) {