diff options
Diffstat (limited to '')
3 files changed, 13 insertions, 12 deletions
diff --git a/src/main/java/design/controller/userinput/menus/CourseSearch.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java index 7170b5d..b9e29bd 100644 --- a/src/main/java/design/controller/userinput/menus/CourseSearch.java +++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java @@ -51,7 +51,7 @@ public class CourseSearch extends Menu { List<ICourse> queryResult = query.getQueryResult().getCourses(); // 0 - return to main menu - l.add(new MenuOption("return to main menu", (a) -> new MainMenu().present())); + l.add(new MenuOption("return to main menu", () -> new MainMenu().present())); // if we find no results, let the user know. if (queryResult.isEmpty()) @@ -74,8 +74,9 @@ public class CourseSearch extends Menu { // if we find a leaf (course), display it as a menu option if (icourse instanceof Course c) { - menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes, " + c.getTotalPar() + " total par", - (a) -> { + var name = String.format("%s, %s, Difficulty: %s, %s holes, %s total par", + c.getName(), c.getLocation(), c.getDifficultyRating(), c.getHoleCount(), c.getTotalPar()); + menuOptions.add(new MenuOption(name, () -> { Golfer currentGolfer = Session.getCurrentGolfer(); if(currentGolfer == null) { diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java index 724f6a3..9f2d8df 100644 --- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java +++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java @@ -47,7 +47,7 @@ public class FiltersMenu extends Menu { System.out.println(query.printFilters()); return List.of( - new MenuOption("return to search", (c) -> new SearchMenu().present()) + new MenuOption("return to search", () -> new SearchMenu().present()) ); } } diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java index 198e254..8b50265 100644 --- a/src/main/java/design/controller/userinput/menus/SearchMenu.java +++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java @@ -22,14 +22,14 @@ public class SearchMenu extends Menu { @Override public List<MenuOption> getMenuOptions() { return List.of( - new MenuOption("return to main menu", (a) -> new MainMenu().present()), - new MenuOption("search...", (a) -> new CourseSearch().search()), - new MenuOption("add difficulty filter...", (a) -> new FiltersMenu().addFilter(new SortByDifficulty())), - new MenuOption("add hole count filter...", (a) -> new FiltersMenu().addFilter(new SortByHoles())), - new MenuOption("add location filter...", (a) -> new FiltersMenu().addFilter(new SortByLocation())), - new MenuOption("add par filter...", (a) -> new FiltersMenu().addFilter(new SortByPar())), - new MenuOption("list filters", (a) -> new FiltersMenu().present()), - new MenuOption("clear all filters", (a) -> new FiltersMenu().clearFilters()) + new MenuOption("return to main menu", () -> new MainMenu().present()), + new MenuOption("search...", () -> new CourseSearch().search()), + new MenuOption("add difficulty filter...", () -> new FiltersMenu().addFilter(new SortByDifficulty())), + new MenuOption("add hole count filter...", () -> new FiltersMenu().addFilter(new SortByHoles())), + new MenuOption("add location filter...", () -> new FiltersMenu().addFilter(new SortByLocation())), + new MenuOption("add par filter...", () -> new FiltersMenu().addFilter(new SortByPar())), + new MenuOption("list filters", () -> new FiltersMenu().present()), + new MenuOption("clear all filters", () -> new FiltersMenu().clearFilters()) ); } } |