From d982cfe8a22ec7eb89186fed875a483a51c3505f Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 00:31:02 -0400 Subject: Add code to handle id serialization --- src/main/java/design/model/Course.java | 9 ++++++++- src/main/java/design/model/Golfer.java | 17 ++++++++++++----- src/main/java/design/model/Play.java | 6 ++++++ src/main/java/design/model/Round.java | 10 +++++++++- 4 files changed, 35 insertions(+), 7 deletions(-) (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 8dfecd8..f90c8d9 100644 --- a/src/main/java/design/model/Course.java +++ b/src/main/java/design/model/Course.java @@ -3,6 +3,8 @@ package design.model; import java.util.List; public class Course implements ICourse { + + private final int id; private final String name; private final int difficultyRating; private final String location; @@ -10,7 +12,8 @@ public class Course implements ICourse { private final int totalPar; private final List holes; - public Course(String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + public Course(int id, String name, int difficultyRating, String location, int holeCount, int totalPar, List holes) { + this.id = id; this.name = name; this.difficultyRating = difficultyRating; this.location = location; @@ -19,6 +22,10 @@ public class Course implements ICourse { this.holes = holes; } + public int getId() { + return id; + } + public String getName() { return name; } diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 8f09067..1a6c7b6 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -7,15 +7,24 @@ 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 courses; private final List rounds; + // for deserialization + public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + this.username = username; + this.passwordHash = passwordHash; + this.fullName = fullName; + this.courses = courses; + this.rounds = 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(); + this.courses = new ArrayList<>(); + this.rounds = new ArrayList<>(); } public String getUsername() { @@ -61,6 +70,4 @@ public class Golfer { public void addRound(Round round) { rounds.add(round); } - - } diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index b61228b..cf44cd8 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -7,6 +7,12 @@ public class Play { private final int distance; private final List swings; + // for deserialization + private Play(int distance, List swings) { + this.distance = distance; + this.swings = swings; + } + public Play(int distance) { this.swings = new ArrayList<>(); this.distance = distance; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 38975da..39de907 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -5,11 +5,19 @@ import java.util.ArrayList; import java.util.List; public class Round { - private final transient Course course; + private final Course course; private final LocalDateTime dateTime; private final Hole startingHole; private final List plays; + // for deserialization + private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { + this.course = course; + this.dateTime = dateTime; + this.startingHole = startingHole; + this.plays = plays; + } + public Round(Course course, LocalDateTime dateTime, Hole startingHole) { this.course = course; this.dateTime = dateTime; -- cgit v1.2.3 From 29c4a7caffea3957b8ac5f6be13d640c1a798989 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 3 Oct 2025 20:37:43 -0400 Subject: Serialization fully working --- src/main/java/design/model/Golfer.java | 6 ++++-- src/main/java/design/model/Play.java | 4 +++- src/main/java/design/model/Round.java | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 1a6c7b6..04ad8bc 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -10,8 +12,8 @@ public class Golfer { private final List courses; private final List rounds; - // for deserialization - public Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { + @JsonCreator + private Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { this.username = username; this.passwordHash = passwordHash; this.fullName = fullName; diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index cf44cd8..ca6dac2 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.util.ArrayList; import java.util.List; @@ -7,7 +9,7 @@ public class Play { private final int distance; private final List swings; - // for deserialization + @JsonCreator private Play(int distance, List swings) { this.distance = distance; this.swings = swings; diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 39de907..048a21a 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -1,5 +1,7 @@ package design.model; +import com.fasterxml.jackson.annotation.JsonCreator; + import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -10,7 +12,7 @@ public class Round { private final Hole startingHole; private final List plays; - // for deserialization + @JsonCreator private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { this.course = course; this.dateTime = dateTime; -- cgit v1.2.3 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 From 4c485841954cb566d82b2e14a0cddf347a3d8e18 Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 03:37:44 -0400 Subject: Created holepaly in model --- src/main/java/design/model/holeplay/HoleCompleteState.java | 0 src/main/java/design/model/holeplay/HolePlayContext.java | 0 src/main/java/design/model/holeplay/HoleState.java | 0 src/main/java/design/model/holeplay/PlayState.java | 0 src/main/java/design/model/holeplay/SetupState.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/java/design/model/holeplay/HoleCompleteState.java create mode 100644 src/main/java/design/model/holeplay/HolePlayContext.java create mode 100644 src/main/java/design/model/holeplay/HoleState.java create mode 100644 src/main/java/design/model/holeplay/PlayState.java create mode 100644 src/main/java/design/model/holeplay/SetupState.java (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/holeplay/HoleCompleteState.java b/src/main/java/design/model/holeplay/HoleCompleteState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/HoleState.java b/src/main/java/design/model/holeplay/HoleState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/PlayState.java b/src/main/java/design/model/holeplay/PlayState.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3 From fc8584b1defdbfeaf80ad3e0c7bdb9f53cf2929c Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 03:57:37 -0400 Subject: Completed first take of holeplay logic and added empty test files --- .../design/model/holeplay/HoleCompleteState.java | 28 ++++++++ .../design/model/holeplay/HolePlayContext.java | 84 ++++++++++++++++++++++ src/main/java/design/model/holeplay/HoleState.java | 15 ++++ src/main/java/design/model/holeplay/PlayState.java | 31 ++++++++ .../java/design/model/holeplay/SetupState.java | 32 +++++++++ 5 files changed, 190 insertions(+) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/holeplay/HoleCompleteState.java b/src/main/java/design/model/holeplay/HoleCompleteState.java index e69de29..958fe5f 100644 --- a/src/main/java/design/model/holeplay/HoleCompleteState.java +++ b/src/main/java/design/model/holeplay/HoleCompleteState.java @@ -0,0 +1,28 @@ +package design.model.holeplay; + +public class HoleCompleteState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* compute summaries if needed */ } + + @Override + public void handleStart(HolePlayContext ctx) { + // optional: treat this as “Next Hole” + ctx.setState(new SetupState()); + } + + @Override + public void handleShot(HolePlayContext ctx, design.model.Club club, Integer distanceYds) { + throw new IllegalStateException("Hole is complete; start next hole."); + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + throw new IllegalStateException("Already holed out."); + } + + @Override + public String name() { + return "HoleCompleteState"; + } +} diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java index e69de29..7445073 100644 --- a/src/main/java/design/model/holeplay/HolePlayContext.java +++ b/src/main/java/design/model/holeplay/HolePlayContext.java @@ -0,0 +1,84 @@ +package design.model.holeplay; + +import design.model.*; +import design.persistence.PersonalDatabase; + +public class HolePlayContext { + private final Golfer golfer; + private final Round round; + private final PersonalDatabase pdb; + + private HoleState state; + private Play currentPlay; + private int strokes; + private int distanceRemainingYds; + + public HolePlayContext(Golfer golfer, Round round, PersonalDatabase pdb) { + this.golfer = golfer; + this.round = round; + this.pdb = pdb; + setState(new SetupState()); + } + + public void setState(HoleState next) { + this.state = next; + next.enter(this); + } + + // API the PTUI/Commands will call: + public void startHole() { + state.handleStart(this); + } + + public void recordShot(Club club, Integer distanceYds) { + state.handleShot(this, club, distanceYds); + } + + public void holeOut() { + state.handleHoleOut(this); + } + + // package-private helpers the states use: + void beginNewPlay(int holeNumber, int par) { + /* create Play, reset counters */ } + + void addSwing(Club club, Integer distanceYds) { + /* add Swing to currentPlay; strokes++; distanceRemainingYds -= distanceYds */ } + + void finalizePlayAndPersist() { + /* round.addPlay(currentPlay); currentPlay=null; pdb.updateGolfer(golfer); */ } + + // getters you’ll want: + public Golfer getGolfer() { + return golfer; + } + + public Round getRound() { + return round; + } + + public Play getCurrentPlay() { + return currentPlay; + } + + public int getStrokes() { + return strokes; + } + + public int getDistanceRemainingYds() { + return distanceRemainingYds; + } + + // setters used internally + void setCurrentPlay(Play p) { + this.currentPlay = p; + } + + void setStrokes(int s) { + this.strokes = s; + } + + void setDistanceRemainingYds(int d) { + this.distanceRemainingYds = d; + } +} \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/HoleState.java b/src/main/java/design/model/holeplay/HoleState.java index e69de29..ec0618f 100644 --- a/src/main/java/design/model/holeplay/HoleState.java +++ b/src/main/java/design/model/holeplay/HoleState.java @@ -0,0 +1,15 @@ +package design.model.holeplay; + +import design.model.Club; + +public interface HoleState { + void enter(HolePlayContext ctx); + + void handleStart(HolePlayContext ctx); + + void handleShot(HolePlayContext ctx, Club club, Integer distanceYds); // distance may be null + + void handleHoleOut(HolePlayContext ctx); + + String name(); +} \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/PlayState.java b/src/main/java/design/model/holeplay/PlayState.java index e69de29..e41af6b 100644 --- a/src/main/java/design/model/holeplay/PlayState.java +++ b/src/main/java/design/model/holeplay/PlayState.java @@ -0,0 +1,31 @@ +package design.model.holeplay; + +import design.model.Club; + +public class PlayState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* no-op */ } + + @Override + public void handleStart(HolePlayContext ctx) { + throw new IllegalStateException("Hole already started."); + } + + @Override + public void handleShot(HolePlayContext ctx, Club club, Integer distanceYds) { + ctx.addSwing(club, distanceYds); + // remain in PlayState + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + ctx.finalizePlayAndPersist(); + ctx.setState(new HoleCompleteState()); + } + + @Override + public String name() { + return "PlayState"; + } +} diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java index e69de29..2715e7c 100644 --- a/src/main/java/design/model/holeplay/SetupState.java +++ b/src/main/java/design/model/holeplay/SetupState.java @@ -0,0 +1,32 @@ +package design.model.holeplay; + +import design.model.Hole; + +public class SetupState implements HoleState { + @Override + public void enter(HolePlayContext ctx) { + /* no-op */ } + + @Override + public void handleStart(HolePlayContext ctx) { + // Pull current hole number & par from Round/Course + Hole start = ctx.getRound().getStartingHole(); // or compute from current-hole tracking if you add it + ctx.beginNewPlay(start.getNumber(), start.getPar()); + ctx.setState(new PlayState()); + } + + @Override + public void handleShot(HolePlayContext ctx, design.model.Club club, Integer distanceYds) { + throw new IllegalStateException("Cannot record a shot during setup."); + } + + @Override + public void handleHoleOut(HolePlayContext ctx) { + throw new IllegalStateException("Cannot hole out during setup."); + } + + @Override + public String name() { + return "SetupState"; + } +} -- cgit v1.2.3 From 40470b1788c28f1c95bba7339dd9819b0e9b95cc Mon Sep 17 00:00:00 2001 From: Michael Lizzio Date: Sun, 5 Oct 2025 05:29:38 -0400 Subject: Updated logic and completed holeplay subsystem --- src/main/java/design/model/Golfer.java | 10 ++++ src/main/java/design/model/Hole.java | 3 ++ src/main/java/design/model/Play.java | 25 ++++++---- src/main/java/design/model/Round.java | 17 +++++++ .../design/model/holeplay/HolePlayContext.java | 56 ++++++++++++++++------ .../java/design/model/holeplay/SetupState.java | 9 ++-- 6 files changed, 94 insertions(+), 26 deletions(-) (limited to 'src/main/java/design/model') diff --git a/src/main/java/design/model/Golfer.java b/src/main/java/design/model/Golfer.java index 04ad8bc..19d6ac6 100644 --- a/src/main/java/design/model/Golfer.java +++ b/src/main/java/design/model/Golfer.java @@ -11,6 +11,7 @@ public class Golfer { private String fullName; private final List courses; private final List rounds; + private final List clubs = new ArrayList<>(); // Keep track of golfer's clubs @JsonCreator private Golfer(String username, int passwordHash, String fullName, List courses, List rounds) { @@ -72,4 +73,13 @@ public class Golfer { public void addRound(Round round) { rounds.add(round); } + + // Helpers dealing with clubs + public void addClub(Club c) { + clubs.add(c); + } + + public boolean hasClub(Club c) { + return clubs.contains(c); + } } diff --git a/src/main/java/design/model/Hole.java b/src/main/java/design/model/Hole.java index bc9fdb9..23dc783 100644 --- a/src/main/java/design/model/Hole.java +++ b/src/main/java/design/model/Hole.java @@ -3,6 +3,7 @@ package design.model; public class Hole { private final int number; private final int par; + // TODO: Maybe add a yardage interger var public Hole(int number, int par) { this.number = number; @@ -16,4 +17,6 @@ public class Hole { public int getPar() { return par; } + + // TODO: Maybe add a get yardage method } diff --git a/src/main/java/design/model/Play.java b/src/main/java/design/model/Play.java index ca6dac2..2e083b9 100644 --- a/src/main/java/design/model/Play.java +++ b/src/main/java/design/model/Play.java @@ -6,22 +6,22 @@ import java.util.ArrayList; import java.util.List; public class Play { - private final int distance; + private int holeNumber; private final List swings; @JsonCreator - private Play(int distance, List swings) { - this.distance = distance; - this.swings = swings; + public Play(int holeNumber, List swings) { + this.holeNumber = holeNumber; + this.swings = (swings != null) ? swings : new ArrayList<>(); } - public Play(int distance) { + public Play(int holeNumber) { + this.holeNumber = holeNumber; this.swings = new ArrayList<>(); - this.distance = distance; } - public int getDistance() { - return distance; + public int getHoleNumber() { + return holeNumber; } public void addSwing(Swing swing) { @@ -35,4 +35,13 @@ public class Play { public int getSwingCount() { return swings.size(); } + + // Returns the sum of all swing distances + public int getDistance() { + int total = 0; + for (Swing s : swings) { + total += s.getDistance(); + } + return total; + } } diff --git a/src/main/java/design/model/Round.java b/src/main/java/design/model/Round.java index 048a21a..bc4914e 100644 --- a/src/main/java/design/model/Round.java +++ b/src/main/java/design/model/Round.java @@ -11,6 +11,7 @@ public class Round { private final LocalDateTime dateTime; private final Hole startingHole; private final List plays; + private int currentHoleIndex; @JsonCreator private Round(Course course, LocalDateTime dateTime, Hole startingHole, List plays) { @@ -18,6 +19,9 @@ public class Round { this.dateTime = dateTime; this.startingHole = startingHole; this.plays = plays; + // Allows the golfer to start anywhere on the course. Helps HolePalyContext be + // simpler. + this.currentHoleIndex = Math.max(0, startingHole.getNumber() - 1); } public Round(Course course, LocalDateTime dateTime, Hole startingHole) { @@ -25,6 +29,9 @@ public class Round { this.dateTime = dateTime; this.startingHole = startingHole; plays = new ArrayList<>(); + // Allows the golfer to start anywhere on the course. Helps HolePalyContext be + // simpler. + this.currentHoleIndex = Math.max(0, startingHole.getNumber() - 1); } public int getTotalSwings() { @@ -52,4 +59,14 @@ public class Round { public void addPlay(Play play) { plays.add(play); } + + // Current hole + public Hole getCurrentHole() { + return course.getHoles().get(currentHoleIndex); + } + + // Handles wraparound too + public void nextHole() { + currentHoleIndex = (currentHoleIndex + 1) % course.getHoleCount(); + } } diff --git a/src/main/java/design/model/holeplay/HolePlayContext.java b/src/main/java/design/model/holeplay/HolePlayContext.java index 7445073..7a5d8ef 100644 --- a/src/main/java/design/model/holeplay/HolePlayContext.java +++ b/src/main/java/design/model/holeplay/HolePlayContext.java @@ -1,5 +1,8 @@ package design.model.holeplay; +import java.io.IOException; +import java.util.ArrayList; + import design.model.*; import design.persistence.PersonalDatabase; @@ -11,7 +14,6 @@ public class HolePlayContext { private HoleState state; private Play currentPlay; private int strokes; - private int distanceRemainingYds; public HolePlayContext(Golfer golfer, Round round, PersonalDatabase pdb) { this.golfer = golfer; @@ -38,15 +40,49 @@ public class HolePlayContext { state.handleHoleOut(this); } - // package-private helpers the states use: - void beginNewPlay(int holeNumber, int par) { - /* create Play, reset counters */ } + void beginNewPlay(int holeNumber) { + this.currentPlay = new Play(holeNumber); + this.strokes = 0; + } void addSwing(Club club, Integer distanceYds) { - /* add Swing to currentPlay; strokes++; distanceRemainingYds -= distanceYds */ } + // Checks golfer owns club maybe not necessary + // if (golfer.hasClub(club)) { + // throw new IllegalArgumentException("Club not in golfer's bag"); + // } + int d = (distanceYds == null ? 0 : distanceYds); + this.currentPlay.addSwing(new Swing(d, club)); + this.strokes++; + + } void finalizePlayAndPersist() { - /* round.addPlay(currentPlay); currentPlay=null; pdb.updateGolfer(golfer); */ } + round.addPlay(currentPlay); + round.nextHole(); + currentPlay = null; + strokes = 0; + // Not sure if try catch is necessary + try { + pdb.updateGolfer(golfer); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void clearInProgressPlay() { + this.setCurrentPlay(null); + this.setStrokes(0); + } + + public void endRoundNow() { + try { + pdb.updateGolfer(golfer); // persist whatever’s done so far + } catch (IOException e) { + e.printStackTrace(); + } + setState(new SetupState()); + } // getters you’ll want: public Golfer getGolfer() { @@ -65,10 +101,6 @@ public class HolePlayContext { return strokes; } - public int getDistanceRemainingYds() { - return distanceRemainingYds; - } - // setters used internally void setCurrentPlay(Play p) { this.currentPlay = p; @@ -77,8 +109,4 @@ public class HolePlayContext { void setStrokes(int s) { this.strokes = s; } - - void setDistanceRemainingYds(int d) { - this.distanceRemainingYds = d; - } } \ No newline at end of file diff --git a/src/main/java/design/model/holeplay/SetupState.java b/src/main/java/design/model/holeplay/SetupState.java index 2715e7c..d49ea0e 100644 --- a/src/main/java/design/model/holeplay/SetupState.java +++ b/src/main/java/design/model/holeplay/SetupState.java @@ -3,15 +3,16 @@ package design.model.holeplay; import design.model.Hole; public class SetupState implements HoleState { + @Override public void enter(HolePlayContext ctx) { - /* no-op */ } + ctx.clearInProgressPlay(); // Maybe we don't need this? + } @Override public void handleStart(HolePlayContext ctx) { - // Pull current hole number & par from Round/Course - Hole start = ctx.getRound().getStartingHole(); // or compute from current-hole tracking if you add it - ctx.beginNewPlay(start.getNumber(), start.getPar()); + Hole hole = ctx.getRound().getCurrentHole(); + ctx.beginNewPlay(hole.getNumber()); ctx.setState(new PlayState()); } -- cgit v1.2.3