From 42fcc633ddc0e328561f984a6aa0b8593765dcf2 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 21:52:50 -0400 Subject: minor project reorganization --- src/main/java/design/model/Course.java | 2 ++ src/main/java/design/model/ICourse.java | 16 ---------------- .../java/design/model/course_search/CourseSorter.java | 1 - src/main/java/design/model/course_search/ICourse.java | 18 ++++++++++++++++++ .../design/model/course_search/SortByDifficulty.java | 1 - .../java/design/model/course_search/SortByHoles.java | 1 - .../design/model/course_search/SortByLocation.java | 1 - .../java/design/model/course_search/SortByName.java | 1 - .../java/design/model/course_search/SortByPar.java | 1 - 9 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 src/main/java/design/model/ICourse.java create mode 100644 src/main/java/design/model/course_search/ICourse.java (limited to 'src/main/java/design/model') 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/ICourse.java b/src/main/java/design/model/ICourse.java deleted file mode 100644 index fd171d3..0000000 --- a/src/main/java/design/model/ICourse.java +++ /dev/null @@ -1,16 +0,0 @@ -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 getHoles(); - int getHoleCount(); - int getTotalPar(); -} 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/course_search/ICourse.java b/src/main/java/design/model/course_search/ICourse.java new file mode 100644 index 0000000..e50eb1b --- /dev/null +++ b/src/main/java/design/model/course_search/ICourse.java @@ -0,0 +1,18 @@ +package design.model.course_search; + +import design.model.Hole; + +import java.util.List; + +/* + * Defines the interface for courses to implement + * Willem Dalton + */ +public interface ICourse { + String getName(); + float getDifficultyRating(); + String getLocation(); + List getHoles(); + int getHoleCount(); + int getTotalPar(); +} 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; -- cgit v1.2.3