Menu cleanup - pass 2

1 files changed, 4 insertions, 20 deletions

diff --git a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
index 33450c9..48fff4e 100644
--- a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
+++ b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
@@ -46,35 +46,19 @@ public class HolePlayMenu extends Menu {
             opts.add(new MenuOption("take a shot", () -> {
                 // loads golfers clubs
                 var golfer = Session.getCurrentGolfer();
-                Club[] clubs = (golfer == null) ? new Club[0] : golfer.getClubs();
 
-                if (clubs.length == 0) {
+                if (!golfer.hasClubs()) {
                     System.out.println("You don't have any clubs yet. Add one first.");
 //                    new AddClubMenu().present();
                     this.present();
                     return;
                 }
 
-                // list clubs
-                System.out.println("-- YOUR CLUBS --");
-                for (int i = 0; i < clubs.length; i++) {
-                    Club c = clubs[i];
-                    System.out.println(c);
-                }
+                var selectClub = new SelectClub(golfer);
+                selectClub.present();
+                Club club = selectClub.getResult();
 
-                // user selects one of their clubs
                 Scanner sc = new Scanner(System.in);
-                Club club = null;
-                while (club == null) {
-                    System.out.print("Select club # (1.." + clubs.length + "): ");
-                    String line = sc.nextLine().trim();
-                    int idx = Integer.parseInt(line);
-                    if (idx < 1 || idx > clubs.length) {
-                        System.out.println("Out of range. Try again.");
-                        continue;
-                    }
-                    club = clubs[idx - 1];
-                }
 
                 // Get shot distance (defaults to 0 of not stated)
                 System.out.print("Distance (yds, blank=0): ");