Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
ccac9974c8183f7f0d30e8cabd84ee0386e8cd97
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
package domain;

import java.io.Serializable;
import java.util.LinkedList;

import configuration.ConfigXML;

public class Administrator implements Serializable {

	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;

	private static Administrator admin = null;
	private static LinkedList<RuralHouse> addRequest;
	private static LinkedList<RuralHouse> removeRequest;
	private static LinkedList<Account> newOwnerRequest;
	static ConfigXML c;

	private Administrator() {
		addRequest = new LinkedList<RuralHouse>();
		removeRequest = new LinkedList<RuralHouse>();
		newOwnerRequest = new LinkedList<Account>();
	}

	
	public LinkedList<RuralHouse> getAddRequest() {
		return addRequest;
	}

	public LinkedList<RuralHouse> getRemoveRequest() {
		return removeRequest;
	}

	public void setAddRequest(LinkedList<RuralHouse> addRequest) {
		Administrator.addRequest = addRequest;
	}

	public void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
		Administrator.removeRequest = removeRequest;

	}

	public LinkedList<Account> getNewOwnerRequest() {
		return newOwnerRequest;
	}

	public void setNewOwnerRequest(LinkedList<Account> newOwnerRequest) {
		Administrator.newOwnerRequest = newOwnerRequest;
	}

}

Commits for RRRRHHHH_CoderuralHouses client/src/domain/Administrator.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

25898b ... Diff Diff camjan Mon 18 May, 2015 15:26:01 +0000

Account adding and deleting fixed

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

Merge conflicts solutioned