Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
b09f345318baa9ca734e11c87f52f8522d7cc1fb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
package domain;

import java.io.Serializable;
import java.util.Vector;

public class Owner implements Serializable {

	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;
	private String bankAccount = "";
	private String name = "";
	private String mailAccount = "";
	private Vector<RuralHouse> ruralHouses;


	public Owner(String name, String bankAccount,String mail) {
		this.bankAccount = bankAccount;
		this.name = name;
		this.mailAccount = mail;
		ruralHouses = new Vector<RuralHouse>();
	}

	public String getName() {
		return this.name;
	}

	public void setName(String name) {
		this.name = name;
	}

	public String getBankAccount() {
		return this.bankAccount;
	}

	public void setBankAccount(String bankAccount) {
		this.bankAccount = bankAccount;
	}

	public Vector<RuralHouse> getRuralHouses(){
		return this.ruralHouses;
	}



	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 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;
	}
	
	

}

Commits for RRRRHHHH_CoderuralHouses client/src/domain/Owner.java

Diff revisions: vs.
Revision Author Commited Message
ccac99 ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:42:17 +0000

Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/domain/Owner.java
ruralHouses client/src/domain/RuralHouse.java
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Booking.java

d30bcc ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:32:33 +0000

cleaning

e90cb4 ... Diff Diff camjan Tue 19 May, 2015 19:39:31 +0000

Owner deletion added

4f8bcc ... epinzolas001 Mon 18 May, 2015 09:49:54 +0000

Merge conflicts solutioned