Convert DAOs to proper singleton format

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/design/model/course_search/CurrentSearchQuery.java b/src/main/java/design/model/course_search/CurrentSearchQuery.java
index 999dfcb..b302261 100644
--- a/src/main/java/design/model/course_search/CurrentSearchQuery.java
+++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java
@@ -10,10 +10,17 @@ import java.util.stream.Collectors;
  * Represents the state of our current search.
  */
 public class CurrentSearchQuery {
-    public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery();
+    private static CurrentSearchQuery INSTANCE;
+
+    public static CurrentSearchQuery instance() {
+        if (INSTANCE == null) {
+            INSTANCE = new CurrentSearchQuery();
+        }
+        return INSTANCE;
+    }
 
     // initialize our search with the master db data
-    MasterDatabase db = MasterDatabase.INSTANCE;
+    MasterDatabase db = MasterDatabase.instance();
     private CourseList query = db.getCourseList();
     private final List<CourseSorter> filters = new ArrayList<CourseSorter>();