Merge pull request #12 from RIT-SWEN-262/menu-reorganize

Menu reorganize

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/design/controller/userinput/Menu.java b/src/main/java/design/controller/userinput/Menu.java
index 0b2fb26..ab633e1 100644
--- a/src/main/java/design/controller/userinput/Menu.java
+++ b/src/main/java/design/controller/userinput/Menu.java
@@ -11,19 +11,19 @@ public abstract class Menu {
         var menuOptions = getMenuOptions();
         System.out.println();
         System.out.printf("-- %s --\n", getTitle().toUpperCase());
-        for (int i = 0; i < menuOptions.size(); i++) {
-            MenuOption menuOption = menuOptions.get(i);
+        for (int i = 1; i <= menuOptions.size(); i++) {
+            MenuOption menuOption = menuOptions.get(i-1);
             System.out.printf("%s: %s\n", i, menuOption.getName());
         }
 
-        System.out.print("Selection: ");
+        System.out.printf("Selection (%s..%s): ", 1, menuOptions.size());
         Scanner sc = new Scanner(System.in);
         var line = sc.nextLine();
 
         try {
-            int i = Integer.parseInt(line);
+            int i = Integer.parseInt(line) - 1;
             menuOptions.get(i).onAction();
-        } catch (ArrayIndexOutOfBoundsException ex) {
+        } catch (IndexOutOfBoundsException ex) {
             System.err.printf("Invalid option \"%s\"\n", line);
             present();
         }