From e218e35f333f8a30d213c7d3eebeb6f5f6bbcea3 Mon Sep 17 00:00:00 2001 From: WillemDalton Date: Thu, 2 Oct 2025 08:55:33 -0400 Subject: more progress on the strategy, unit testing --- src/model/course-search/CourseList.java | 51 --------------------------- src/model/course-search/CourseSorter | 5 --- src/model/course-search/SortByDifficulty.java | 10 ------ src/model/course-search/SortByHoles.java | 10 ------ src/model/course-search/SortByLocation.java | 10 ------ src/model/course-search/SortByName.java | 10 ------ src/model/course-search/SortByPar.java | 10 ------ 7 files changed, 106 deletions(-) delete mode 100644 src/model/course-search/CourseList.java delete mode 100644 src/model/course-search/CourseSorter delete mode 100644 src/model/course-search/SortByDifficulty.java delete mode 100644 src/model/course-search/SortByHoles.java delete mode 100644 src/model/course-search/SortByLocation.java delete mode 100644 src/model/course-search/SortByName.java delete mode 100644 src/model/course-search/SortByPar.java (limited to 'src/model/course-search') 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 courses; - - public CourseList() - { - courses = new ArrayList<>(); - sorter = new CourseSorter(); - } - - public List getCourses() - { - return courses; - } - - public setCourses(List 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 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 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 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 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 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 courses) - { - courses.sort(courses, (Course c1, Course c2) -> (c1.getTotalPar() > c2.getTotalPar())); - } -} \ No newline at end of file -- cgit v1.2.3