RRRRHHHH_Code

URLs

Explore

Commits

Diff Revisions 46d6c3 ... vs 0f75b2 ... for ruralHouses/src/businessLogic/AdminManager.java

		@@ -6,31 +6,38 @@
6	6		import domain.RuralHouse;
7	7
8	8		public class AdminManager {
9		-	public AdminManager (){
10		-
	9	+	public AdminManager() {
	10	+
11	11		}
12		-	public Vector<RuralHouse> getAdditionRequests(){
13		-	return new Vector<RuralHouse>(Administrator.getAddRequest());
	12	+
	13	+	public Vector<RuralHouse> getAdditionRequests() {
	14	+	return new Vector<RuralHouse>(Administrator.getInstance()
	15	+	.getAddRequest());
14	16		}
15		-
16		-	public Vector<RuralHouse> getDeletionRequests(){
17		-	return new Vector<RuralHouse>(Administrator.getRemoveRequest());
	17	+
	18	+	public Vector<RuralHouse> getDeletionRequests() {
	19	+	return new Vector<RuralHouse>(Administrator.getInstance()
	20	+	.getRemoveRequest());
18	21		}
19		-	public void removeHouseAdditionRequests(RuralHouse house){
20		-	Administrator.getAddRequest().remove(house);
	22	+
	23	+	public void removeHouseAdditionRequests(RuralHouse house) {
	24	+	Administrator.getInstance().getAddRequest().remove(house);
21	25		}
22		-	public void removeHouseDeletionRequests(RuralHouse house){
23		-	Administrator.getRemoveRequest().remove(house);
24		-	}
25		-	public boolean addAdditionRequest(RuralHouse rh){
26		-	if(this.getAdditionRequests().contains(rh)){
	26	+
	27	+	public void removeHouseDeletionRequests(RuralHouse house) {
	28	+	Administrator.getInstance().getRemoveRequest().remove(house);
	29	+	}
	30	+
	31	+	public boolean addAdditionRequest(RuralHouse rh) {
	32	+	if (this.getAdditionRequests().contains(rh)) {
27	33		return false;
28	34		}
29		-	return Administrator.getAddRequest().add(rh);
	35	+	return Administrator.getInstance().getAddRequest().add(rh);
30	36		}
31		-	public boolean addDeletionRequest(RuralHouse rh){
32		-	if(this.getDeletionRequests().contains(rh))
	37	+
	38	+	public boolean addDeletionRequest(RuralHouse rh) {
	39	+	if (this.getDeletionRequests().contains(rh))
33	40		return false;
34		-	return Administrator.getRemoveRequest().add(rh);
	41	+	return Administrator.getInstance().getRemoveRequest().add(rh);
35	42		}
36	43		}

View View this file contents

History View the full history

Feeds

Commits for ruralHouses/src/businessLogic/AdminManager.java