Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
	ruralHouses/src/gui/DeleteHouseGUI.java

diff --git a/ruralHouses/src/businessLogic/HouseManager.java b/ruralHouses/src/businessLogic/HouseManager.java
index 72d8285..e1dfa57 100644 (file)
--- a/ruralHouses/src/businessLogic/HouseManager.java
+++ b/ruralHouses/src/businessLogic/HouseManager.java
@@ -44,8 +44,8 @@ public class HouseManager implements HouseManagerInterface {
 
        
        
-       public void removeHouse(String houseName) {
-               this.dbMngr.removeHouse(houseName);
+       public void removeHouse(RuralHouse rh) {
+               this.dbMngr.removeHouse(rh);
        }
 
 

diff --git a/ruralHouses/src/businessLogic/HouseManagerInterface.java b/ruralHouses/src/businessLogic/HouseManagerInterface.java
index 5e56aed..ee528cc 100644 (file)
--- a/ruralHouses/src/businessLogic/HouseManagerInterface.java
+++ b/ruralHouses/src/businessLogic/HouseManagerInterface.java
@@ -21,7 +21,7 @@ public interface HouseManagerInterface {
        // String description, String town, int nRooms, int nKitchens,
        // int nBaths, int nLivings, int nParkings);
 
-       public void removeHouse(String houseName);
+       public void removeHouse(RuralHouse rh);
 
 
        /**

diff --git a/ruralHouses/src/dataAccess/DB4oManager.java b/ruralHouses/src/dataAccess/DB4oManager.java
index b46eafa..8ab8d83 100644 (file)
--- a/ruralHouses/src/dataAccess/DB4oManager.java
+++ b/ruralHouses/src/dataAccess/DB4oManager.java
@@ -369,15 +369,14 @@ public class DB4oManager {
                return stored;
        }
 
-       public void removeHouse(String houseName) {
+       public void removeHouse(RuralHouse rh) {
 
                if (c.isDatabaseLocal() == false)
                        openSDB();
                else
                        openDB();               
-               RuralHouse house = new RuralHouse(houseName, null, null, null, null);
                try {
-                       ObjectSet<RuralHouse> result = db.queryByExample(house);
+                       ObjectSet<RuralHouse> result = db.queryByExample(rh);
                        if (!result.isEmpty()) {
                                RuralHouse found = (RuralHouse) result.get(0);
                                db.delete(found);

diff --git a/ruralHouses/src/domain/Account.java b/ruralHouses/src/domain/Account.java
index f6f6460..795f739 100644 (file)
--- a/ruralHouses/src/domain/Account.java
+++ b/ruralHouses/src/domain/Account.java
@@ -2,17 +2,25 @@ package domain;
 
 public class Account {
 
-       
-
-       private String username="";
-       private String password="";
+       private String username = "";
+       private String password = "";
        private Owner owner;
-       
-       public Account (String usr, String pass, Owner ow){
+       private Administrator admin;
+
+       public Account(String usr, String pass, Administrator admin) {
                this.username = usr;
-               this.password= pass;
-               this.owner= ow;
-               
+               this.password = pass;
+               this.owner = null;
+               this.admin = admin;
+
+       }
+
+       public Account(String usr, String pass, Owner ow) {
+               this.username = usr;
+               this.password = pass;
+               this.owner = ow;
+               this.admin = null;
+
        }
 
        public String getUsername() {
@@ -26,7 +34,13 @@ public class Account {
        public Owner getOwner() {
                return owner;
        }
-       
 
-       
+       public Administrator getAdmin() {
+               return admin;
+       }
+
+       public void setAdmin(Administrator admin) {
+               this.admin = admin;
+       }
+
 }

diff --git a/ruralHouses/src/domain/Administrator.java b/ruralHouses/src/domain/Administrator.java
new file mode 100644 (file)
index 0000000..8a554de
--- /dev/null
+++ b/ruralHouses/src/domain/Administrator.java
@@ -0,0 +1,25 @@
+package domain;
+
+import java.util.LinkedList;
+
+public class Administrator {
+
+       private LinkedList<RuralHouse> addRequest;
+       private LinkedList<RuralHouse> removeRequest;
+       
+       private Administrator(){
+       }
+       
+       public LinkedList<RuralHouse> getAddRequest() {
+               return addRequest;
+       }
+       public void setAddRequest(LinkedList<RuralHouse> addRequest) {
+               this.addRequest = addRequest;
+       }
+       public LinkedList<RuralHouse> getRemoveRequest() {
+               return removeRequest;
+       }
+       public void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
+               this.removeRequest = removeRequest;
+       }
+}

diff --git a/ruralHouses/src/gui/DeleteHouseGUI.java b/ruralHouses/src/gui/DeleteHouseGUI.java
index d5c4386..b023c5a 100644 (file)
--- a/ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/ruralHouses/src/gui/DeleteHouseGUI.java
@@ -4,6 +4,7 @@ import java.awt.BorderLayout;
 import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Vector;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
@@ -31,16 +32,15 @@ public class DeleteHouseGUI extends JFrame {
         * Create the frame.
         */
        public DeleteHouseGUI(Owner o) {
-               o = owner;
+               this.owner = o;
                setBounds(100, 100, 450, 300);
                contentPane = new JPanel();
                contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
                setContentPane(contentPane);
-
-               o.getRuralHouses();
-               
-               comboBox = new JComboBox(o.getRuralHouses());
+                       
+               comboBox = new JComboBox(this.owner.getRuralHouses());
                
+
                JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
                
                JButton btnDelete = new JButton("DELETE");
@@ -85,6 +85,6 @@ public class DeleteHouseGUI extends JFrame {
        private void actionListenerButton(ActionEvent e){
                RuralHouse toDel = (RuralHouse)comboBox.getSelectedItem();
                HouseManagerInterface hm = new HouseManager();
-               hm.removeHouse(toDel.getHouseName());
+               hm.removeHouse(toDel);
        }
 }