summaryrefslogtreecommitdiff
path: root/src/main/java/design/controller/userinput
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/design/controller/userinput')
-rw-r--r--src/main/java/design/controller/userinput/menus/CourseSearch.java (renamed from src/main/java/design/controller/userinput/menus/SelectCourse.java)17
-rw-r--r--src/main/java/design/controller/userinput/menus/FiltersMenu.java4
-rw-r--r--src/main/java/design/controller/userinput/menus/SearchMenu.java5
3 files changed, 18 insertions, 8 deletions
diff --git a/src/main/java/design/controller/userinput/menus/SelectCourse.java b/src/main/java/design/controller/userinput/menus/CourseSearch.java
index 0a57ab6..6bba2ef 100644
--- a/src/main/java/design/controller/userinput/menus/SelectCourse.java
+++ b/src/main/java/design/controller/userinput/menus/CourseSearch.java
@@ -10,7 +10,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
-public class SelectCourse extends Menu {
+/*
+ * The actual SEARCH feature of course searching.
+ */
+public class CourseSearch extends Menu {
CurrentSearchQuery query = CurrentSearchQuery.INSTANCE;
@Override
@@ -27,12 +30,12 @@ public class SelectCourse extends Menu {
Scanner sc = new Scanner(System.in);
String searchTerm = sc.nextLine();
- // reset the query so we aren't trying to search on an already searched query
- query.reset();
-
// search and present
query.search(searchTerm);
this.present();
+
+ // reset the query after we're done.
+ query.reset();
}
/*
@@ -59,7 +62,8 @@ public class SelectCourse extends Menu {
}
- // recursively go through tree structure of courselist to make menu options
+ // recursively go through tree structure of courselist to make menu options.
+ // this is all for displaying the menu options, not the actual sorting.
private void addCoursesRecursive(List<MenuOption> menuOptions, CourseList list)
{
for (ICourse icourse : list.getCourses())
@@ -67,11 +71,12 @@ public class SelectCourse 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",
+ menuOptions.add(new MenuOption( c.getName() + ", " + c.getLocation() + ", Difficulty: " + c.getDifficultyRating() + ", " + c.getHoleCount() + " holes, " + c.getTotalPar() + " total par",
(a) -> {
Golfer currentGolfer = Session.getCurrentGolfer();
if(currentGolfer == null)
{
+ // if we aren't logged in, notify the user.
System.out.println("\n\n !!! log into a golfer account to add courses to your profile. !!! \n\n");
new MainMenu().present();
}
diff --git a/src/main/java/design/controller/userinput/menus/FiltersMenu.java b/src/main/java/design/controller/userinput/menus/FiltersMenu.java
index 3a2463f..724f6a3 100644
--- a/src/main/java/design/controller/userinput/menus/FiltersMenu.java
+++ b/src/main/java/design/controller/userinput/menus/FiltersMenu.java
@@ -8,8 +8,10 @@ import java.util.List;
import design.model.course_search.CurrentSearchQuery;
+/*
+ * Tracks the user's current filters on their search.
+ */
public class FiltersMenu extends Menu {
-
CurrentSearchQuery query = CurrentSearchQuery.INSTANCE;
@Override
diff --git a/src/main/java/design/controller/userinput/menus/SearchMenu.java b/src/main/java/design/controller/userinput/menus/SearchMenu.java
index 9411b02..198e254 100644
--- a/src/main/java/design/controller/userinput/menus/SearchMenu.java
+++ b/src/main/java/design/controller/userinput/menus/SearchMenu.java
@@ -9,6 +9,9 @@ import design.model.course_search.SortByPar;
import java.util.List;
+/*
+ * The main control panel for course searching.
+ */
public class SearchMenu extends Menu {
@Override
@@ -20,7 +23,7 @@ public class SearchMenu extends Menu {
public List<MenuOption> getMenuOptions() {
return List.of(
new MenuOption("return to main menu", (a) -> new MainMenu().present()),
- new MenuOption("search...", (a) -> new SelectCourse().search()),
+ 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())),