fast com

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

diff --git a/ruralHouses/src/domain/Owner.java b/ruralHouses/src/domain/Owner.java
index 35f390c..eb436f9 100644 (file)
--- a/ruralHouses/src/domain/Owner.java
+++ b/ruralHouses/src/domain/Owner.java
@@ -3,22 +3,27 @@ package domain;
 import java.io.Serializable;
 import java.util.Vector;
 
-@SuppressWarnings("serial")
 public class Owner implements Serializable {
 
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
        private String bankAccount = "";
-       private String name="";
+       private String name = "";
+       private String mailAccount = "";
        private Vector<RuralHouse> ruralHouses;
 
-       public Owner(String name) {
-               this.name=name;
-               ruralHouses=new Vector<RuralHouse>();           
-       }
+//     public Owner(String name) {
+//             this.name = name;
+//             ruralHouses = new hVector<RuralHouse>();
+//     }
 
-       public Owner(String name, String bankAccount) {
-               this.bankAccount=bankAccount;
-               this.name=name;
-               ruralHouses=new Vector<RuralHouse>();           
+       public Owner(String name, String bankAccount,String mail) {
+               this.bankAccount = bankAccount;
+               this.name = name;
+               this.mailAccount = mail;
+               ruralHouses = new Vector<RuralHouse>();
        }
 
        public String getName() {
@@ -37,18 +42,38 @@ 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(String houseName, 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(houseName, this, description, town,feature);
                ruralHouses.add(rh);
                return rh;
        }
        
-       public String toString(){
+       public RuralHouse addRuralHouse(RuralHouse rh) {
+               ruralHouses.add(rh);
+               return rh;
+       }
+
+       public String toString() {
                return name;
        }
 
+       public String getMailAccount() {
+               return mailAccount;
+       }
+
+       public void setMailAccount(String mailAccount) {
+               this.mailAccount = mailAccount;
+       }
+       
+       
+
 }
\ No newline at end of file