X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/blobdiff_plain/7b7027e13369849d213c9b4e118395e4bfd23dc2..a927255f6eb55fb1f52738b9b88ce51f9b0ed9bc:/ruralHouses/src/domain/Owner.java diff --git a/ruralHouses/src/domain/Owner.java b/ruralHouses/src/domain/Owner.java index 35f390c..cd68e3c 100644 --- a/ruralHouses/src/domain/Owner.java +++ b/ruralHouses/src/domain/Owner.java @@ -7,18 +7,18 @@ import java.util.Vector; public class Owner implements Serializable { private String bankAccount = ""; - private String name=""; + private String name = ""; private Vector ruralHouses; public Owner(String name) { - this.name=name; - ruralHouses=new Vector(); + this.name = name; + ruralHouses = new Vector(); } public Owner(String name, String bankAccount) { - this.bankAccount=bankAccount; - this.name=name; - ruralHouses=new Vector(); + this.bankAccount = bankAccount; + this.name = name; + ruralHouses = new Vector(); } public String getName() { @@ -37,17 +37,22 @@ public class Owner implements Serializable { this.bankAccount = bankAccount; } - public Vector getRuralHouses() { - return ruralHouses; + public Vector 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; }