RRRRHHHH_Code
Diff Revisions
afdc66 ...
vs
5ad0cc ...
for ruralHouses/src/domain/RuralHouse.java
|
@@ -12,7 +12,7 @@ |
12 |
12 |
|
private String houseName; |
13 |
13 |
|
private String description; |
14 |
14 |
|
private Owner owner; |
15 |
|
- |
private String town; |
|
15 |
+ |
private String district; |
16 |
16 |
|
private HouseFeatures features; |
17 |
17 |
|
public Vector<Offer> offers; |
18 |
18 |
|
public boolean isAccepted; |
|
@@ -21,11 +21,11 @@ |
21 |
21 |
|
super(); |
22 |
22 |
|
} |
23 |
23 |
|
|
24 |
|
- |
public RuralHouse(String houseName, Owner owner, String description, String town , HouseFeatures features) { |
|
24 |
+ |
public RuralHouse(String houseName, Owner owner, String description, String ds , HouseFeatures features) { |
25 |
25 |
|
this.houseName = houseName; |
26 |
26 |
|
this.description = description; |
27 |
27 |
|
this.owner = owner; |
28 |
|
- |
this.town = town; |
|
28 |
+ |
this.district = ds; |
29 |
29 |
|
this.features = features; |
30 |
30 |
|
offers=new Vector<Offer>(); |
31 |
31 |
|
} |
|
@@ -56,12 +56,12 @@ |
56 |
56 |
|
this.owner=owner; |
57 |
57 |
|
} |
58 |
58 |
|
|
59 |
|
- |
public String getTown() { |
60 |
|
- |
return town; |
|
59 |
+ |
public String getDistrict() { |
|
60 |
+ |
return district; |
61 |
61 |
|
} |
62 |
62 |
|
|
63 |
|
- |
public void setTown(String town) { |
64 |
|
- |
this.town=town; |
|
63 |
+ |
public void setDistrict(String ds) { |
|
64 |
+ |
this.district=ds; |
65 |
65 |
|
} |
66 |
66 |
|
public HouseFeatures getFeatures() { |
67 |
67 |
|
return features; |
|
@@ -71,7 +71,7 @@ |
71 |
71 |
|
this.features = features; |
72 |
72 |
|
} |
73 |
73 |
|
public String toString() { |
74 |
|
- |
return this.houseName + ": " + this.town; |
|
74 |
+ |
return this.houseName + ": " + this.district; |
75 |
75 |
|
} |
76 |
76 |
|
|
77 |
77 |
|
public Offer createOffer(int offerNumber,Date firstDay, Date lastDay, float price) { |