summaryrefslogtreecommitdiff
path: root/src/main/java/design/controller
diff options
context:
space:
mode:
authorsowgro <tpoke.ferrari@gmail.com>2025-10-26 14:42:40 -0400
committersowgro <tpoke.ferrari@gmail.com>2025-10-26 14:42:40 -0400
commitf793ece34e825f9e6e6d84146d0dfc533ae6816b (patch)
tree88d9af0789d14c6a87d0dd022773a95381378fa0 /src/main/java/design/controller
parent69c58b592cb496cad95165d32ebf99aa52268e5c (diff)
downloaddesignproject-design-6-f793ece34e825f9e6e6d84146d0dfc533ae6816b.tar.gz
designproject-design-6-f793ece34e825f9e6e6d84146d0dfc533ae6816b.tar.bz2
designproject-design-6-f793ece34e825f9e6e6d84146d0dfc533ae6816b.zip
Convert DAOs to proper singleton format
Diffstat (limited to 'src/main/java/design/controller')
-rw-r--r--src/main/java/design/controller/userinput/menus/CourseSearch.java4
-rw-r--r--src/main/java/design/controller/userinput/menus/HolePlayMenu.java2
-rw-r--r--src/main/java/design/controller/userinput/menus/ManageClubs.java2
-rw-r--r--src/main/java/design/controller/userinput/menus/ManageCourses.java2
-rw-r--r--src/main/java/design/controller/userinput/menus/SearchMenu.java2
-rw-r--r--src/main/java/design/controller/userinput/menus/SelectUser.java2
-rw-r--r--src/main/java/design/controller/userinput/menus/UserSettings.java2
7 files changed, 8 insertions, 8 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..b4f33db 100644
--- a/src/main/java/design/controller/userinput/menus/CourseSearch.java
+++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java
@@ -19,8 +19,8 @@ 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 = CurrentSearchQuery.instance();
+ private final PersonalDatabase personalDB = PersonalDatabase.instance();
private final Golfer golfer = Session.getCurrentGolfer();
@Override
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..6d74eed 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 = CurrentSearchQuery.instance();
@Override
public String getTitle() {
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