more progress on the strategy, unit testing

15 files changed, 199 insertions, 2 deletions

diff --git a/src/model/Club.java b/src/main/java/design/model/Club.java
index 57a43d1..57a43d1 100644
--- a/src/model/Club.java
+++ b/src/main/java/design/model/Club.java
diff --git a/src/model/Course.java b/src/main/java/design/model/Course.java
index 5f8c43d..8dfecd8 100644
--- a/src/model/Course.java
+++ b/src/main/java/design/model/Course.java
@@ -2,7 +2,7 @@ package design.model;
 
 import java.util.List;
 
-public class Course {
+public class Course implements ICourse {
     private final String name;
     private final int difficultyRating;
     private final String location;
@@ -23,7 +23,7 @@ public class Course {
         return name;
     }
 
-    public int getDifficultyRating() {
+    public float getDifficultyRating() {
         return difficultyRating;
     }
 
diff --git a/src/model/Golfer.java b/src/main/java/design/model/Golfer.java
index 8f09067..8f09067 100644
--- a/src/model/Golfer.java
+++ b/src/main/java/design/model/Golfer.java
diff --git a/src/model/Hole.java b/src/main/java/design/model/Hole.java
index bc9fdb9..bc9fdb9 100644
--- a/src/model/Hole.java
+++ b/src/main/java/design/model/Hole.java
diff --git a/src/main/java/design/model/ICourse.java b/src/main/java/design/model/ICourse.java
new file mode 100644
index 0000000..fd171d3
--- /dev/null
+++ b/src/main/java/design/model/ICourse.java
@@ -0,0 +1,16 @@
+package design.model;
+
+import java.util.List;
+
+/*
+ * Defines the interface for courses to implement 
+ * Willem Dalton
+ */
+public interface ICourse {
+    String getName();
+    float getDifficultyRating();
+    String getLocation();
+    List<Hole> getHoles();
+    int getHoleCount();
+    int getTotalPar();
+}
diff --git a/src/model/Play.java b/src/main/java/design/model/Play.java
index b61228b..b61228b 100644
--- a/src/model/Play.java
+++ b/src/main/java/design/model/Play.java
diff --git a/src/model/Round.java b/src/main/java/design/model/Round.java
index 38975da..38975da 100644
--- a/src/model/Round.java
+++ b/src/main/java/design/model/Round.java
diff --git a/src/model/Swing.java b/src/main/java/design/model/Swing.java
index a93b66f..a93b66f 100644
--- a/src/model/Swing.java
+++ b/src/main/java/design/model/Swing.java
diff --git a/src/main/java/design/model/course_search/CourseList.java b/src/main/java/design/model/course_search/CourseList.java
new file mode 100644
index 0000000..82648c2
--- /dev/null
+++ b/src/main/java/design/model/course_search/CourseList.java
@@ -0,0 +1,89 @@
+package design.model.course_search;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import design.model.*;
+
+/*
+ * Defines a list of courses that can be sorted, added to or removed from.
+ * Willem Dalton
+ */
+public class CourseList implements ICourse {
+    private CourseSorter sorter;
+    private List<ICourse> courses;
+
+    public CourseList()
+    {
+        courses = new ArrayList<>();
+    }
+
+    /*
+     * Grab the list of courses
+     */
+    public List<ICourse> getCourses()
+    {
+        return courses;
+    }
+
+    /*
+     * Set the list of courses equal to an existing list
+     */
+    public void setCourses(List<ICourse> courses)
+    {
+        this.courses = courses;
+    }
+
+    /*
+    * set the chosen sorting algorithm for the given list.
+    */
+    public void setSorter(CourseSorter courseSorter)
+    {
+        sorter = courseSorter;
+    }
+
+    /*
+     * Add a new course to the list.
+     */
+    public void add(ICourse course)
+    {
+        courses.add(course);
+    }
+
+    /*
+     * Remove a course from the list. 
+     */
+    public void remove(ICourse course)
+    {
+        courses.remove(course);
+    }
+
+    /*
+     * Sort the list.
+     */
+    public void sort()
+    {
+        sorter.sortCourses(courses);
+    }
+
+    /*
+     * All overrides of the ICourse class. This is a drawback of the composite pattern, but it's pretty negligible here. return some dummy values.
+     */
+    @Override
+    public String getName() { return "Course List"; }
+    
+    @Override
+    public float getDifficultyRating() { return 0; }
+
+    @Override
+    public String getLocation() { return ""; }
+    
+    @Override
+    public int getTotalPar() { return 0; }
+
+    @Override
+    public int getHoleCount() { return 0; }
+
+    @Override
+    public List<Hole> getHoles() { return null; }
+}
diff --git a/src/main/java/design/model/course_search/CourseSorter.java b/src/main/java/design/model/course_search/CourseSorter.java
new file mode 100644
index 0000000..a3d1186
--- /dev/null
+++ b/src/main/java/design/model/course_search/CourseSorter.java
@@ -0,0 +1,12 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+
+/*
+ * Defines an interface that concrete strategies will implement
+ * Willem Dalton
+ */
+public interface CourseSorter {
+    public void sortCourses(List<ICourse> courses);
+}
\ No newline at end of file
diff --git a/src/main/java/design/model/course_search/SortByDifficulty.java b/src/main/java/design/model/course_search/SortByDifficulty.java
new file mode 100644
index 0000000..c006a40
--- /dev/null
+++ b/src/main/java/design/model/course_search/SortByDifficulty.java
@@ -0,0 +1,16 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+import java.util.Comparator;
+
+/*
+ * Concrete strategy for sorting courses by their difficulty rating.
+ * Willem Dalton
+ */
+public class SortByDifficulty implements CourseSorter {
+    public void sortCourses(List<ICourse> courses)
+    {
+        courses.sort(Comparator.comparing(ICourse::getDifficultyRating));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/design/model/course_search/SortByHoles.java b/src/main/java/design/model/course_search/SortByHoles.java
new file mode 100644
index 0000000..da98d4f
--- /dev/null
+++ b/src/main/java/design/model/course_search/SortByHoles.java
@@ -0,0 +1,16 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+import java.util.Comparator;
+
+/*
+ * Concrete strategy by sorting courses by their hole count (9 or 18)
+ * Willem Dalton
+ */
+public class SortByHoles implements CourseSorter {
+    public void sortCourses(List<ICourse> courses)
+    {
+        courses.sort(Comparator.comparing(ICourse::getHoleCount));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/design/model/course_search/SortByLocation.java b/src/main/java/design/model/course_search/SortByLocation.java
new file mode 100644
index 0000000..ae9bd8b
--- /dev/null
+++ b/src/main/java/design/model/course_search/SortByLocation.java
@@ -0,0 +1,16 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+import java.util.Comparator;
+
+/*
+ * Concrete strategy for sorting courses by their location.
+ * Willem Dalton
+ */
+public class SortByLocation implements CourseSorter {
+    public void sortCourses(List<ICourse> courses)
+    {
+        courses.sort(Comparator.comparing(ICourse::getLocation));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/design/model/course_search/SortByName.java b/src/main/java/design/model/course_search/SortByName.java
new file mode 100644
index 0000000..04625c6
--- /dev/null
+++ b/src/main/java/design/model/course_search/SortByName.java
@@ -0,0 +1,16 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+import java.util.Comparator;
+
+/*
+ * Concrete strategy for sorting courses base on their name.
+ * Willem Dalton
+ */
+public class SortByName implements CourseSorter {
+    public void sortCourses(List<ICourse> courses)
+    {
+        courses.sort(Comparator.comparing(ICourse::getName));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/design/model/course_search/SortByPar.java b/src/main/java/design/model/course_search/SortByPar.java
new file mode 100644
index 0000000..2fa388c
--- /dev/null
+++ b/src/main/java/design/model/course_search/SortByPar.java
@@ -0,0 +1,16 @@
+package design.model.course_search;
+
+import design.model.*;
+import java.util.List;
+import java.util.Comparator;
+
+/*
+ * Concrete strategy for sorting courses based on their total par.
+ * Willem Dalton
+ */
+public class SortByPar implements CourseSorter {
+    public void sortCourses(List<ICourse> courses)
+    {
+        courses.sort(Comparator.comparing(ICourse::getTotalPar));
+    }
+}
\ No newline at end of file