diff options
Diffstat (limited to 'src/main/java/design/controller')
9 files changed, 24 insertions, 23 deletions
diff --git a/src/main/java/design/controller/userinput/Action.java b/src/main/java/design/controller/userinput/Action.java index 0b52bfc..bb16585 100644 --- a/src/main/java/design/controller/userinput/Action.java +++ b/src/main/java/design/controller/userinput/Action.java @@ -2,5 +2,5 @@ package design.controller.userinput; @FunctionalInterface public interface Action { - void onCommand(String[] args); + void onCommand(); } diff --git a/src/main/java/design/controller/userinput/Menu.java b/src/main/java/design/controller/userinput/Menu.java index 605b640..8eac5dd 100644 --- a/src/main/java/design/controller/userinput/Menu.java +++ b/src/main/java/design/controller/userinput/Menu.java @@ -14,13 +14,14 @@ public abstract class Menu { MenuOption menuOption = menuOptions.get(i); System.out.printf("%s: %s\n", i, menuOption.getName()); } + + System.out.print("Selection: "); Scanner sc = new Scanner(System.in); var line = sc.nextLine(); - var split = line.split(" "); try { - int i = Integer.parseInt(split[0]); - menuOptions.get(i).onCommand(Arrays.copyOfRange(split, 1, split.length)); + int i = Integer.parseInt(line); + menuOptions.get(i).onCommand(); } catch (ArrayIndexOutOfBoundsException ex) { System.err.printf("Invalid option \"%s\"\n", line); present(); diff --git a/src/main/java/design/controller/userinput/MenuOption.java b/src/main/java/design/controller/userinput/MenuOption.java index 9635ebd..5ae9521 100644 --- a/src/main/java/design/controller/userinput/MenuOption.java +++ b/src/main/java/design/controller/userinput/MenuOption.java @@ -13,7 +13,7 @@ public class MenuOption { return name; } - public void onCommand(String[] args) { - action.onCommand(args); + public void onCommand() { + action.onCommand(); } } diff --git a/src/main/java/design/controller/userinput/menus/CourseSelectMenu.java b/src/main/java/design/controller/userinput/menus/CourseSelectMenu.java index 881c393..8df9823 100644 --- a/src/main/java/design/controller/userinput/menus/CourseSelectMenu.java +++ b/src/main/java/design/controller/userinput/menus/CourseSelectMenu.java @@ -26,10 +26,10 @@ public class CourseSelectMenu extends Menu { List<MenuOption> opts = new ArrayList<>(); // 0) back - opts.add(new MenuOption("back to main menu", a -> new MainMenu().present())); + opts.add(new MenuOption("back to main menu", () -> new MainMenu().present())); // 1) pick course by number TODO: add error checking - opts.add(new MenuOption("pick course by number (1..1000)", a -> { + opts.add(new MenuOption("pick course by number (1..1000)", () -> { Scanner sc = new Scanner(System.in); System.out.print("Course number (1..1000): "); diff --git a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java index bcd7560..e12bdfa 100644 --- a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java +++ b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java @@ -36,14 +36,14 @@ public class HolePlayMenu extends Menu { if (inSetup) { // 0) Start hole - opts.add(new MenuOption("start hole", (a) -> { + opts.add(new MenuOption("start hole", () -> { ctx.startHole(); System.out.println("Started hole " + round.getCurrentHole().getNumber() + "."); this.present(); })); } else { // 0) Take a shot - opts.add(new MenuOption("take a shot", (a) -> { + opts.add(new MenuOption("take a shot", () -> { // Gets club Scanner sc = new Scanner(System.in); System.out.print("Club nickname: "); @@ -68,7 +68,7 @@ public class HolePlayMenu extends Menu { })); // 1) Hole out - opts.add(new MenuOption("hole out", (a) -> { + opts.add(new MenuOption("hole out", () -> { // Precedes to next hole int prev = round.getCurrentHole().getNumber(); ctx.holeOut(); @@ -78,7 +78,7 @@ public class HolePlayMenu extends Menu { } // End round (always shown) - opts.add(new MenuOption("end round", (a) -> { + opts.add(new MenuOption("end round", () -> { ctx.endRoundNow(); System.out.println("Round ended."); new MainMenu().present(); diff --git a/src/main/java/design/controller/userinput/menus/MainMenu.java b/src/main/java/design/controller/userinput/menus/MainMenu.java index c76e61a..1d6b72d 100644 --- a/src/main/java/design/controller/userinput/menus/MainMenu.java +++ b/src/main/java/design/controller/userinput/menus/MainMenu.java @@ -14,9 +14,9 @@ public class MainMenu extends Menu { @Override public List<MenuOption> getMenuOptions() { return List.of( - new MenuOption("user settings...", (a) -> new UserSettings().present()), - new MenuOption("statistics...", (a) -> new StatisticsMenu().present()), - new MenuOption("log round...", (a) -> new CourseSelectMenu().present()), - new MenuOption("quit", (a) -> {})); + new MenuOption("user settings...", () -> new UserSettings().present()), + new MenuOption("statistics...", () -> new StatisticsMenu().present()), + new MenuOption("log round...", () -> new CourseSelectMenu().present()), + new MenuOption("quit", () -> {})); } } diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java index 2f1a867..fd73b47 100644 --- a/src/main/java/design/controller/userinput/menus/SelectUser.java +++ b/src/main/java/design/controller/userinput/menus/SelectUser.java @@ -21,12 +21,12 @@ public class SelectUser extends Menu { public List<MenuOption> getMenuOptions() { var l = new ArrayList<MenuOption>(); // Sets user in Session too - l.addAll(Arrays.stream(personalDB.getGolfers()).map(i -> new MenuOption(i.getUsername(), (a) -> { + l.addAll(Arrays.stream(personalDB.getGolfers()).map(i -> new MenuOption(i.getUsername(), () -> { Session.setCurrentGolfer(i); System.out.printf("Loaded user: %s%n", i.getUsername()); new UserSettings().present(); })).toList()); - l.add(new MenuOption("<create>", (a) -> { + l.add(new MenuOption("<create>", () -> { })); return l; } diff --git a/src/main/java/design/controller/userinput/menus/StatisticsMenu.java b/src/main/java/design/controller/userinput/menus/StatisticsMenu.java index 66d60e3..c609177 100644 --- a/src/main/java/design/controller/userinput/menus/StatisticsMenu.java +++ b/src/main/java/design/controller/userinput/menus/StatisticsMenu.java @@ -15,7 +15,7 @@ public class StatisticsMenu extends Menu { @Override public List<MenuOption> getMenuOptions() { return List.of( - new MenuOption("return to main menu", (c) -> new MainMenu().present()) + new MenuOption("return to main menu", () -> new MainMenu().present()) ); } } diff --git a/src/main/java/design/controller/userinput/menus/UserSettings.java b/src/main/java/design/controller/userinput/menus/UserSettings.java index a866889..3fda5d9 100644 --- a/src/main/java/design/controller/userinput/menus/UserSettings.java +++ b/src/main/java/design/controller/userinput/menus/UserSettings.java @@ -15,10 +15,10 @@ public class UserSettings extends Menu { @Override public List<MenuOption> getMenuOptions() { return List.of( - new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("switch user...", (a) -> new SelectUser().present()), - new MenuOption("set username...", (a -> {})), - new MenuOption("set password...", (a) -> {}) + new MenuOption("return to main menu", () -> new MainMenu().present()), + new MenuOption("switch user...", () -> new SelectUser().present()), + new MenuOption("set username...", () -> {}), + new MenuOption("set password...", () -> {}) ); } } |