implemented lacking GUIs and corrected errors
[RRRRHHHH_Code] / ruralHouses / src / domain / Owner.java
index 35f390c..cd68e3c 100644 (file)
@@ -7,18 +7,18 @@ import java.util.Vector;
 public class Owner implements Serializable {
 
        private String bankAccount = "";
-       private String name="";
+       private String name = "";
        private Vector<RuralHouse> ruralHouses;
 
        public Owner(String name) {
-               this.name=name;
-               ruralHouses=new Vector<RuralHouse>();           
+               this.name = name;
+               ruralHouses = new Vector<RuralHouse>();
        }
 
        public Owner(String name, String bankAccount) {
-               this.bankAccount=bankAccount;
-               this.name=name;
-               ruralHouses=new Vector<RuralHouse>();           
+               this.bankAccount = bankAccount;
+               this.name = name;
+               ruralHouses = new Vector<RuralHouse>();
        }
 
        public String getName() {
@@ -37,17 +37,22 @@ public class Owner implements Serializable {
                this.bankAccount = bankAccount;
        }
 
-       public Vector<RuralHouse> getRuralHouses() {
-               return ruralHouses;
+       public Vector<RuralHouse> getRuralHouses(){
+               return this.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;
        }