Merge pull request #13 from RIT-SWEN-262/singleton-daos

Singleton daos

7 files changed, 13 insertions, 9 deletions

diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java
index 9d67b51..b84247a 100644
--- a/src/main/java/design/controller/userinput/menus/CourseSearch.java
+++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java
@@ -19,10 +19,14 @@ import java.util.Scanner;
  * The actual SEARCH feature of course searching.
  */
 public class CourseSearch extends Menu {
-    private final CurrentSearchQuery query = CurrentSearchQuery.INSTANCE;
-    private final PersonalDatabase personalDB = PersonalDatabase.INSTANCE;
+    private final CurrentSearchQuery query;
+    private final PersonalDatabase personalDB = PersonalDatabase.instance();
     private final Golfer golfer = Session.getCurrentGolfer();
 
+    public CourseSearch(CurrentSearchQuery query) {
+        this.query = query;
+    }
+
     @Override
     public String getTitle() {
         return "select course";
diff --git a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
index c824341..e0d1572 100644
--- a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
+++ b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
@@ -21,7 +21,7 @@ public class HolePlayMenu extends Menu {
 
     public HolePlayMenu() {
         this.round = createRound();
-        this.ctx = new HolePlayContext(Session.getCurrentGolfer(), round, PersonalDatabase.INSTANCE);
+        this.ctx = new HolePlayContext(Session.getCurrentGolfer(), round, PersonalDatabase.instance());
     }
 
     @Override
diff --git a/src/main/java/design/controller/userinput/menus/ManageClubs.java b/src/main/java/design/controller/userinput/menus/ManageClubs.java
index 6290444..27b011c 100644
--- a/src/main/java/design/controller/userinput/menus/ManageClubs.java
+++ b/src/main/java/design/controller/userinput/menus/ManageClubs.java
@@ -14,7 +14,7 @@ import java.util.Scanner;
 
 public class ManageClubs extends Menu {
     private final Golfer golfer = Session.getCurrentGolfer();
-    private final PersonalDatabase personalDB = PersonalDatabase.INSTANCE;
+    private final PersonalDatabase personalDB = PersonalDatabase.instance();
 
     @Override
     public String getTitle() {
diff --git a/src/main/java/design/controller/userinput/menus/ManageCourses.java b/src/main/java/design/controller/userinput/menus/ManageCourses.java
index 4306560..b592cd2 100644
--- a/src/main/java/design/controller/userinput/menus/ManageCourses.java
+++ b/src/main/java/design/controller/userinput/menus/ManageCourses.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 public class ManageCourses extends Menu {
     private final Golfer golfer = Session.getCurrentGolfer();
-    private final PersonalDatabase personalDB = PersonalDatabase.INSTANCE;
+    private final PersonalDatabase personalDB = PersonalDatabase.instance();
 
     @Override
     public String getTitle() {
diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java
index 72b39ed..7933f24 100644
--- a/src/main/java/design/controller/userinput/menus/SearchMenu.java
+++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java
@@ -10,7 +10,7 @@ import java.util.List;
  * The main control panel for course searching.
  */
 public class SearchMenu extends Menu {
-    private final CurrentSearchQuery query = CurrentSearchQuery.INSTANCE;
+    private final CurrentSearchQuery query = new CurrentSearchQuery();
 
     @Override
     public String getTitle() {
@@ -22,7 +22,7 @@ public class SearchMenu extends Menu {
         List<MenuOption> menuOptions = new java.util.ArrayList<>();
 
         menuOptions.add(new MenuOption("return to main menu", () -> new MainMenu().present()));
-        menuOptions.add(new MenuOption("search...", () -> new CourseSearch().present()));
+        menuOptions.add(new MenuOption("search...", () -> new CourseSearch(query).present()));
 
         menuOptions.add(new MenuOption("sort by difficulty", () -> addFilter(new SortByDifficulty())));
         menuOptions.add(new MenuOption("sort by hole count", () -> addFilter(new SortByHoles())));
diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java
index e8b3874..4b7928c 100644
--- a/src/main/java/design/controller/userinput/menus/SelectUser.java
+++ b/src/main/java/design/controller/userinput/menus/SelectUser.java
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Scanner;
 
 public class SelectUser extends Menu {
-    private final PersonalDatabase personalDB = PersonalDatabase.INSTANCE;
+    private final PersonalDatabase personalDB = PersonalDatabase.instance();
     private final Action doAfter;
     private final Scanner scanner = new Scanner(System.in);
 
diff --git a/src/main/java/design/controller/userinput/menus/UserSettings.java b/src/main/java/design/controller/userinput/menus/UserSettings.java
index 04ec4d0..47b0a5b 100644
--- a/src/main/java/design/controller/userinput/menus/UserSettings.java
+++ b/src/main/java/design/controller/userinput/menus/UserSettings.java
@@ -15,7 +15,7 @@ import java.util.Scanner;
 public class UserSettings extends Menu {
 
     private final Golfer golfer = Session.getCurrentGolfer();
-    private final PersonalDatabase personalDatabase = PersonalDatabase.INSTANCE;
+    private final PersonalDatabase personalDatabase = PersonalDatabase.instance();
     private final Scanner scanner = new Scanner(System.in);
 
     @Override