summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/design/HelloWorld.java24
-rw-r--r--src/main/java/design/ParPal.java14
-rw-r--r--src/main/java/design/model/Course.java2
-rw-r--r--src/main/java/design/model/course_search/CourseSorter.java1
-rw-r--r--src/main/java/design/model/course_search/ICourse.java (renamed from src/main/java/design/model/ICourse.java)4
-rw-r--r--src/main/java/design/model/course_search/SortByDifficulty.java1
-rw-r--r--src/main/java/design/model/course_search/SortByHoles.java1
-rw-r--r--src/main/java/design/model/course_search/SortByLocation.java1
-rw-r--r--src/main/java/design/model/course_search/SortByName.java1
-rw-r--r--src/main/java/design/model/course_search/SortByPar.java1
-rw-r--r--src/main/java/design/persistence/MasterDatabase.java2
-rw-r--r--src/main/java/design/persistence/PersonalDatabase.java2
12 files changed, 21 insertions, 33 deletions
diff --git a/src/main/java/design/HelloWorld.java b/src/main/java/design/HelloWorld.java
deleted file mode 100644
index 5e16cec..0000000
--- a/src/main/java/design/HelloWorld.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package design;
-
-import design.model.Golfer;
-import design.persistence.CSVMasterDatabase;
-import design.persistence.JSONPersonalDatabase;
-import design.persistence.MasterDatabase;
-import design.persistence.PersonalDatabase;
-
-import java.io.IOException;
-
-public class HelloWorld {
- public static void main(String[] args) throws IOException {
- var mdb = MasterDatabase.INSTANCE;
- var pdb = PersonalDatabase.INSTANCE;
-
-// Golfer g = new Golfer("Tyler Ferrari", "sowgro", "pass");
-// g.addCourse(mdb.getCourse(8));
-//
-// pdb.addGolfer(g);
-
- System.out.println("done");
-
- }
-}
diff --git a/src/main/java/design/ParPal.java b/src/main/java/design/ParPal.java
new file mode 100644
index 0000000..db6891e
--- /dev/null
+++ b/src/main/java/design/ParPal.java
@@ -0,0 +1,14 @@
+package design;
+
+import design.persistence.MasterDatabase;
+import design.persistence.PersonalDatabase;
+
+public class ParPal {
+ public static void main(String[] args) {
+ var mdb = MasterDatabase.INSTANCE;
+ var pdb = PersonalDatabase.INSTANCE;
+
+ System.out.println("done");
+
+ }
+}
diff --git a/src/main/java/design/model/Course.java b/src/main/java/design/model/Course.java
index f90c8d9..f907622 100644
--- a/src/main/java/design/model/Course.java
+++ b/src/main/java/design/model/Course.java
@@ -1,5 +1,7 @@
package design.model;
+import design.model.course_search.ICourse;
+
import java.util.List;
public class Course implements ICourse {
diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java
index a3d1186..7549645 100644
--- a/src/main/java/design/model/course_search/CourseSorter.java
+++ b/src/main/java/design/model/course_search/CourseSorter.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
/*
diff --git a/src/main/java/design/model/ICourse.java b/src/main/java/design/model/course_search/ICourse.java
index fd171d3..e50eb1b 100644
--- a/src/main/java/design/model/ICourse.java
+++ b/src/main/java/design/model/course_search/ICourse.java
@@ -1,4 +1,6 @@
-package design.model;
+package design.model.course_search;
+
+import design.model.Hole;
import java.util.List;
diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java
index c006a40..8c3251c 100644
--- a/src/main/java/design/model/course_search/SortByDifficulty.java
+++ b/src/main/java/design/model/course_search/SortByDifficulty.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
import java.util.Comparator;
diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java
index da98d4f..b1badab 100644
--- a/src/main/java/design/model/course_search/SortByHoles.java
+++ b/src/main/java/design/model/course_search/SortByHoles.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
import java.util.Comparator;
diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java
index ae9bd8b..0d8a8d2 100644
--- a/src/main/java/design/model/course_search/SortByLocation.java
+++ b/src/main/java/design/model/course_search/SortByLocation.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
import java.util.Comparator;
diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java
index 04625c6..2847d3e 100644
--- a/src/main/java/design/model/course_search/SortByName.java
+++ b/src/main/java/design/model/course_search/SortByName.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
import java.util.Comparator;
diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java
index 2fa388c..9a3eaf9 100644
--- a/src/main/java/design/model/course_search/SortByPar.java
+++ b/src/main/java/design/model/course_search/SortByPar.java
@@ -1,6 +1,5 @@
package design.model.course_search;
-import design.model.*;
import java.util.List;
import java.util.Comparator;
diff --git a/src/main/java/design/persistence/MasterDatabase.java b/src/main/java/design/persistence/MasterDatabase.java
index 2852349..ddc0434 100644
--- a/src/main/java/design/persistence/MasterDatabase.java
+++ b/src/main/java/design/persistence/MasterDatabase.java
@@ -3,7 +3,7 @@ package design.persistence;
import design.model.Course;
public interface MasterDatabase {
- public static final MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv");
+ MasterDatabase INSTANCE = new CSVMasterDatabase("data/golf_courses_1000.csv");
Course[] getCourses();
Course getCourse(int id);
diff --git a/src/main/java/design/persistence/PersonalDatabase.java b/src/main/java/design/persistence/PersonalDatabase.java
index 524263b..a045d59 100644
--- a/src/main/java/design/persistence/PersonalDatabase.java
+++ b/src/main/java/design/persistence/PersonalDatabase.java
@@ -5,7 +5,7 @@ import design.model.Golfer;
import java.io.IOException;
public interface PersonalDatabase {
- public static final PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json");
+ PersonalDatabase INSTANCE = new JSONPersonalDatabase("data/personaldb.json");
Golfer[] getGolfers();
Golfer getGolfer(String name);