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/Club.java | 37 --------------- src/model/Course.java | 45 ------------------ src/model/Golfer.java | 66 --------------------------- src/model/Hole.java | 19 -------- src/model/Play.java | 30 ------------ src/model/Round.java | 45 ------------------ src/model/Swing.java | 19 -------- 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 ---- 14 files changed, 367 deletions(-) delete mode 100644 src/model/Club.java delete mode 100644 src/model/Course.java delete mode 100644 src/model/Golfer.java delete mode 100644 src/model/Hole.java delete mode 100644 src/model/Play.java delete mode 100644 src/model/Round.java delete mode 100644 src/model/Swing.java 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') diff --git a/src/model/Club.java b/src/model/Club.java deleted file mode 100644 index 57a43d1..0000000 --- a/src/model/Club.java +++ /dev/null @@ -1,37 +0,0 @@ -package design.model; - -public class Club { - - public enum ClubType { - DRIVER, - WOOD, - IRON, - HYBRID, - PITCHING_WEDGE, - SAND_WEDGE, - LOB_WEDGE, - PUTTER - } - - private final String manufacture; - private final String nickname; - private final ClubType clubType; - - public Club(String manufacture, String nickname, ClubType clubType) { - this.manufacture = manufacture; - this.nickname = nickname; - this.clubType = clubType; - } - - public String getManufacture() { - return manufacture; - } - - public String getNickname() { - return nickname; - } - - public ClubType getClubType() { - return clubType; - } -} diff --git a/src/model/Course.java b/src/model/Course.java deleted file mode 100644 index 5f8c43d..0000000 --- a/src/model/Course.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.util.List; - -public class Course { - private final String name; - private final int difficultyRating; - private final String location; - private final int holeCount; - private final int totalPar; - private final List holes; - - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { - this.name = name; - this.difficultyRating = difficultyRating; - this.location = location; - this.holeCount = holeCount; - this.totalPar = totalPar; - this.holes = holes; - } - - public String getName() { - return name; - } - - public int getDifficultyRating() { - return difficultyRating; - } - - public String getLocation() { - return location; - } - - public int getHoleCount() { - return holeCount; - } - - public int getTotalPar() { - return totalPar; - } - - public List getHoles() { - return holes; - } -} diff --git a/src/model/Golfer.java b/src/model/Golfer.java deleted file mode 100644 index 8f09067..0000000 --- a/src/model/Golfer.java +++ /dev/null @@ -1,66 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -public class Golfer { - private String username; - private int passwordHash; - private String fullName; - private final transient List courses; // might be better to make this like a courseID or something - private final List rounds; - - public Golfer(String fullName, String username, String password) { - this.courses = new ArrayList<>(); - this.rounds = new ArrayList<>(); - this.fullName = fullName; - this.username = username; - this.passwordHash = password.hashCode(); - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getFullName() { - return fullName; - } - - public void setFullName(String fullName) { - this.fullName = fullName; - } - - public void setPassword(String password) { - this.passwordHash = password.hashCode(); - } - - public boolean checkPassword(String password) { - return passwordHash == password.hashCode(); - } - - public Course[] getCourses() { - return courses.toArray(Course[]::new); - } - - public void addCourse(Course course) { - courses.add(course); - } - - public void removeCourse(Course course) { - courses.remove(course); - } - - public Round[] getRounds() { - return rounds.toArray(Round[]::new); - } - - public void addRound(Round round) { - rounds.add(round); - } - - -} diff --git a/src/model/Hole.java b/src/model/Hole.java deleted file mode 100644 index bc9fdb9..0000000 --- a/src/model/Hole.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Hole { - private final int number; - private final int par; - - public Hole(int number, int par) { - this.number = number; - this.par = par; - } - - public int getNumber() { - return number; - } - - public int getPar() { - return par; - } -} diff --git a/src/model/Play.java b/src/model/Play.java deleted file mode 100644 index b61228b..0000000 --- a/src/model/Play.java +++ /dev/null @@ -1,30 +0,0 @@ -package design.model; - -import java.util.ArrayList; -import java.util.List; - -public class Play { - private final int distance; - private final List swings; - - public Play(int distance) { - this.swings = new ArrayList<>(); - this.distance = distance; - } - - public int getDistance() { - return distance; - } - - public void addSwing(Swing swing) { - swings.add(swing); - } - - public Swing[] getSwings() { - return swings.toArray(Swing[]::new); - } - - public int getSwingCount() { - return swings.size(); - } -} diff --git a/src/model/Round.java b/src/model/Round.java deleted file mode 100644 index 38975da..0000000 --- a/src/model/Round.java +++ /dev/null @@ -1,45 +0,0 @@ -package design.model; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class Round { - private final transient Course course; - private final LocalDateTime dateTime; - private final Hole startingHole; - private final List plays; - - public Round(Course course, LocalDateTime dateTime, Hole startingHole) { - this.course = course; - this.dateTime = dateTime; - this.startingHole = startingHole; - plays = new ArrayList<>(); - } - - public int getTotalSwings() { - return plays.stream() - .map(Play::getSwingCount) - .reduce(0, Integer::sum); - } - - public Course getCourse() { - return course; - } - - public LocalDateTime getDateTime() { - return dateTime; - } - - public Hole getStartingHole() { - return startingHole; - } - - public Play[] getPlays() { - return plays.toArray(Play[]::new); - } - - public void addPlay(Play play) { - plays.add(play); - } -} diff --git a/src/model/Swing.java b/src/model/Swing.java deleted file mode 100644 index a93b66f..0000000 --- a/src/model/Swing.java +++ /dev/null @@ -1,19 +0,0 @@ -package design.model; - -public class Swing { - private final int distance; - private final Club clubUsed; - - public Swing(int distance, Club clubUsed) { - this.distance = distance; - this.clubUsed = clubUsed; - } - - public int getDistance() { - return distance; - } - - public Club getClubUsed() { - return clubUsed; - } -} 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