Username is saved hashed and password hashed and salted

[RRRRHHHH_Code] / ruralHouses / src / businessLogic / AdminManager.java

diff --git a/ruralHouses/src/businessLogic/AdminManager.java b/ruralHouses/src/businessLogic/AdminManager.java
index 6ddda72..fe56a5b 100644 (file)
--- a/ruralHouses/src/businessLogic/AdminManager.java
+++ b/ruralHouses/src/businessLogic/AdminManager.java
@@ -6,31 +6,38 @@ import domain.Administrator;
 import domain.RuralHouse;
 
 public class AdminManager {
-       public AdminManager (){
-               
+       public AdminManager() {
+
        }
-       public Vector<RuralHouse> getAdditionRequests(){
-               return new Vector<RuralHouse>(Administrator.getAddRequest());
+
+       public Vector<RuralHouse> getAdditionRequests() {
+               return new Vector<RuralHouse>(Administrator.getInstance()
+                               .getAddRequest());
        }
-       
-       public Vector<RuralHouse> getDeletionRequests(){
-               return new Vector<RuralHouse>(Administrator.getRemoveRequest());
+
+       public Vector<RuralHouse> getDeletionRequests() {
+               return new Vector<RuralHouse>(Administrator.getInstance()
+                               .getRemoveRequest());
        }
-       public void removeHouseAdditionRequests(RuralHouse house){
-               Administrator.getAddRequest().remove(house);
+
+       public void removeHouseAdditionRequests(RuralHouse house) {
+               Administrator.getInstance().getAddRequest().remove(house);
        }
-       public void removeHouseDeletionRequests(RuralHouse house){
-               Administrator.getRemoveRequest().remove(house);
-               }
-       public boolean addAdditionRequest(RuralHouse rh){
-               if(this.getAdditionRequests().contains(rh)){
+
+       public void removeHouseDeletionRequests(RuralHouse house) {
+               Administrator.getInstance().getRemoveRequest().remove(house);
+       }
+
+       public boolean addAdditionRequest(RuralHouse rh) {
+               if (this.getAdditionRequests().contains(rh)) {
                        return false;
                }
-               return Administrator.getAddRequest().add(rh);
+               return Administrator.getInstance().getAddRequest().add(rh);
        }
-       public boolean addDeletionRequest(RuralHouse rh){
-               if(this.getDeletionRequests().contains(rh))
+
+       public boolean addDeletionRequest(RuralHouse rh) {
+               if (this.getDeletionRequests().contains(rh))
                        return false;
-               return Administrator.getRemoveRequest().add(rh);
+               return Administrator.getInstance().getRemoveRequest().add(rh);
        }
 }