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

Singleton daos

1 files changed, 9 insertions, 10 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..b7f0686 100644
--- a/src/main/java/design/model/course_search/CurrentSearchQuery.java
+++ b/src/main/java/design/model/course_search/CurrentSearchQuery.java
@@ -10,12 +10,11 @@ import java.util.stream.Collectors;
  * Represents the state of our current search.
  */
 public class CurrentSearchQuery {
-    public static final CurrentSearchQuery INSTANCE = new CurrentSearchQuery();
 
     // 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>();
+    private final List<CourseSorter> filters = new ArrayList<>();
 
     // reset the query
     public void reset() {
@@ -34,22 +33,22 @@ public class CurrentSearchQuery {
 
     // print out the filters we're currently using and the order
     public String printFilters() {
-        String filterResult = "";
+        StringBuilder filterResult = new StringBuilder();
 
         // no filters? let the user know.
-        if (filters.size() == 0) {
+        if (filters.isEmpty()) {
             return "nothing";
         }
 
         for (CourseSorter f : filters) {
-            filterResult += f.toString() + " --> ";
+            filterResult.append(f.toString()).append(" --> ");
         }
 
         // remove last arrow and add padding
-        filterResult = filterResult.substring(0, filterResult.length() - 5);
-        filterResult += "\n";
+        filterResult = new StringBuilder(filterResult.substring(0, filterResult.length() - 5));
+        filterResult.append("\n");
 
-        return filterResult;
+        return filterResult.toString();
     }
 
     // get all the filters
@@ -128,7 +127,7 @@ public class CurrentSearchQuery {
     // make a CourseList group, a sublist of a group, and filter it. 
     private ICourse makeGroup(List<ICourse> group, List<CourseSorter> filters, int level) {
         // base case, group only has one course in it (already sorted)
-        if (group.size() == 1) return group.get(0);
+        if (group.size() == 1) return group.getFirst();
 
         // group has more than 1 course in it, it needs to be sorted more if possible.
         CourseList subList = new CourseList();