implemented lacking GUIs and corrected errors

[RRRRHHHH_Code] / ruralHouses / src / domain / Owner.java

diff --git a/ruralHouses/src/domain/Owner.java b/ruralHouses/src/domain/Owner.java
index 34255f8..cd68e3c 100644 (file)
--- a/ruralHouses/src/domain/Owner.java
+++ b/ruralHouses/src/domain/Owner.java
@@ -7,24 +7,18 @@ import java.util.Vector;
 public class Owner implements Serializable {
 
        private String bankAccount = "";
-       private String name="";
-       private String username="";
-       private String password="";
+       private String name = "";
        private Vector<RuralHouse> ruralHouses;
 
-       public Owner(String name,String login, String password) {
-               this.name=name;
-               this.username=login;
-               this.password=password;
-               ruralHouses=new Vector<RuralHouse>();           
+       public Owner(String name) {
+               this.name = name;
+               ruralHouses = new Vector<RuralHouse>();
        }
 
-       public Owner(String name,String login, String password, String bankAccount) {
-               this.bankAccount=bankAccount;
-               this.name=name;
-               this.username=login;
-               this.password=password;
-               ruralHouses=new Vector<RuralHouse>();           
+       public Owner(String name, String bankAccount) {
+               this.bankAccount = bankAccount;
+               this.name = name;
+               ruralHouses = new Vector<RuralHouse>();
        }
 
        public String getName() {
@@ -43,33 +37,22 @@ public class Owner implements Serializable {
                this.bankAccount = bankAccount;
        }
 
-       public String getUsername() {
-               return this.username;
-       }
-
-       public void setUsername(String username) {
-               this.username = username;
+       public Vector<RuralHouse> getRuralHouses(){
+               return this.ruralHouses;
        }
 
-       public String getPassword() {
-               return this.password;
-       }
 
-       public void setPassword(String password) {
-               this.password = password;
-       }
 
-       public Vector<RuralHouse> getRuralHouses() {
-               return ruralHouses;
-       }
-
-       public RuralHouse addRuralHouse(int houseNumber, String description, String city) {
-               RuralHouse rh=new RuralHouse(houseNumber,  this,  description,  city);
+       public RuralHouse addRuralHouse(int houseNumber, String description,
+                       String town, int nRooms, int nKitchens, int nBaths, int nLivings,
+                       int nParkings) {
+               HouseFeatures feature = new HouseFeatures(nRooms, nKitchens, nBaths, nLivings, nParkings);
+               RuralHouse rh = new RuralHouse(houseNumber, this, description, town,feature);
                ruralHouses.add(rh);
                return rh;
        }
-       
-       public String toString(){
+
+       public String toString() {
                return name;
        }