more progress on the strategy, unit testing

14 files changed, 2 insertions, 108 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/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/model/course-search/CourseList.java b/src/model/course-search/CourseList.java
deleted file mode 100644
index 2766e11..0000000
--- a/src/model/course-search/CourseList.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package design.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import Course;
-
-/*
- * Defines a list of courses that can be sorted, added to or removed from.
- * Created by Willem Dalton
- */
-public class CourseList {
-    private CourseSorter sorter;
-    private List<Course> courses;
-
-    public CourseList()
-    {
-        courses = new ArrayList<>();
-        sorter = new CourseSorter();
-    }
-
-    public List<Course> getCourses()
-    {
-        return courses;
-    }
-
-    public setCourses(List<Course> courses)
-    {
-        this.courses = courses;
-    }
-
-    setSorter(CourseSorter courseSorter)
-    {
-        sorter = courseSorter;
-    }
-
-    add(Course course)
-    {
-        courses.add(course);
-    }
-
-    remove(Course course)
-    {
-        courses.remove(course);
-    }
-
-    sort()
-    {
-        sorter.sortCourses(courses);
-    }
-}
diff --git a/src/model/course-search/CourseSorter b/src/model/course-search/CourseSorter
deleted file mode 100644
index ae2863d..0000000
--- a/src/model/course-search/CourseSorter
+++ /dev/null
@@ -1,5 +0,0 @@
-package design.model;
-
-public interface CourseSorter {
-    public sortCourses(List<Course> courses);
-}
\ No newline at end of file
diff --git a/src/model/course-search/SortByDifficulty.java b/src/model/course-search/SortByDifficulty.java
deleted file mode 100644
index 2c3634b..0000000
--- a/src/model/course-search/SortByDifficulty.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package design.model;
-
-import CourseSorter;
-
-public class SortByDifficulty implements CourseSorter {
-    sortCourses(List<Course> courses)
-    {
-        courses.sort(courses, (Course c1, Course c2) -> (c1.getDifficultyRating > c2.getDifficultyRating));
-    }
-}
\ No newline at end of file
diff --git a/src/model/course-search/SortByHoles.java b/src/model/course-search/SortByHoles.java
deleted file mode 100644
index 9aa7626..0000000
--- a/src/model/course-search/SortByHoles.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package design.model;
-
-import CourseSorter;
-
-public class SortByHoles implements CourseSorter {
-    sortCourses(List<Course> courses)
-    {
-        courses.sort(courses, (c1, c2) -> (c1.getHoleCount() - c2.getHoleCount()));
-    }
-}
\ No newline at end of file
diff --git a/src/model/course-search/SortByLocation.java b/src/model/course-search/SortByLocation.java
deleted file mode 100644
index d9e7663..0000000
--- a/src/model/course-search/SortByLocation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package design.model;
-
-import CourseSorter;
-
-public class SortByLocation implements CourseSorter {
-    sortCourses(List<Course> courses)
-    {
-        courses.sort(courses, (Course c1, Course c2) -> (c1.getLocation().compareTo(c2.getLocation())));
-    }
-}
\ No newline at end of file
diff --git a/src/model/course-search/SortByName.java b/src/model/course-search/SortByName.java
deleted file mode 100644
index d899982..0000000
--- a/src/model/course-search/SortByName.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package design.model;
-
-import CourseSorter;
-
-public class SortByName implements CourseSorter {
-    sortCourses(List<Course> courses)
-    {
-        courses.sort(courses, (Course c1, Course c2) -> (c1.getName().compareTo(c2.getName())));
-    }
-}
\ No newline at end of file
diff --git a/src/model/course-search/SortByPar.java b/src/model/course-search/SortByPar.java
deleted file mode 100644
index 7b782ec..0000000
--- a/src/model/course-search/SortByPar.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package design.model;
-
-import CourseSorter;
-
-public class SortByPar implements CourseSorter {
-    sortCourses(List<Course> courses)
-    {
-        courses.sort(courses, (Course c1, Course c2) -> (c1.getTotalPar() > c2.getTotalPar()));
-    }
-}
\ No newline at end of file