From 5f1ea0ee335a73edf53939b87218a34e93fe4de9 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 9 Oct 2025 21:03:25 -0400
Subject: Menu cleanup - pass 1

---
 src/main/java/design/controller/userinput/menus/SelectUser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/design/controller/userinput/menus/SelectUser.java')

diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java
index ffae559..8f0a809 100644
--- a/src/main/java/design/controller/userinput/menus/SelectUser.java
+++ b/src/main/java/design/controller/userinput/menus/SelectUser.java
@@ -31,13 +31,13 @@ public class SelectUser extends Menu {
         var opts = new ArrayList<MenuOption>();
 
         for (Golfer i : personalDB.getGolfers()) {
-            MenuOption menuOption = new MenuOption(i.getUsername(), () -> {
+            MenuOption menuOption = new MenuOption(i.toString(), () -> {
                 System.out.print("Enter password: ");
                 var password = scanner.nextLine();
                 if (i.checkPassword(password)) {
                     // Sets user in Session too
                     Session.setCurrentGolfer(i);
-                    System.out.printf("Loaded user: %s%n", i.getUsername());
+                    System.out.printf("Loaded user: %s%n", i);
                     doAfter.onAction();
                 } else {
                     System.out.println("Incorrect password. ");
-- 
cgit v1.2.3


From fac7fb71260b901a893b5b90aae23e86d6c23550 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sat, 11 Oct 2025 22:24:54 -0400
Subject: Menu cleanup - pass 2

---
 .../controller/userinput/menus/SelectUser.java     | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'src/main/java/design/controller/userinput/menus/SelectUser.java')

diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java
index 8f0a809..646124d 100644
--- a/src/main/java/design/controller/userinput/menus/SelectUser.java
+++ b/src/main/java/design/controller/userinput/menus/SelectUser.java
@@ -31,24 +31,11 @@ public class SelectUser extends Menu {
         var opts = new ArrayList<MenuOption>();
 
         for (Golfer i : personalDB.getGolfers()) {
-            MenuOption menuOption = new MenuOption(i.toString(), () -> {
-                System.out.print("Enter password: ");
-                var password = scanner.nextLine();
-                if (i.checkPassword(password)) {
-                    // Sets user in Session too
-                    Session.setCurrentGolfer(i);
-                    System.out.printf("Loaded user: %s%n", i);
-                    doAfter.onAction();
-                } else {
-                    System.out.println("Incorrect password. ");
-                    this.present();
-                }
-            });
+            MenuOption menuOption = new MenuOption(i.toString(), () -> login(i));
             opts.add(menuOption);
         }
 
         opts.add(new MenuOption("<create>", () -> {
-
             System.out.print("Enter username: ");
             var username = scanner.nextLine();
 
@@ -68,4 +55,18 @@ public class SelectUser extends Menu {
 
         return opts;
     }
+
+    private void login(Golfer g) {
+        System.out.print("Enter password: ");
+        var password = scanner.nextLine();
+        if (g.checkPassword(password)) {
+            // Sets user in Session too
+            Session.setCurrentGolfer(g);
+            System.out.printf("Loaded user: %s%n", g);
+            doAfter.onAction();
+        } else {
+            System.out.println("Incorrect password. ");
+            this.present();
+        }
+    }
 }
-- 
cgit v1.2.3


From df8adcc59fad860445527c8a4da820a73036b542 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sat, 11 Oct 2025 23:49:49 -0400
Subject: Menu cleanup - pass 3

---
 src/main/java/design/controller/userinput/menus/SelectUser.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main/java/design/controller/userinput/menus/SelectUser.java')

diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java
index 646124d..e8b3874 100644
--- a/src/main/java/design/controller/userinput/menus/SelectUser.java
+++ b/src/main/java/design/controller/userinput/menus/SelectUser.java
@@ -31,8 +31,7 @@ public class SelectUser extends Menu {
         var opts = new ArrayList<MenuOption>();
 
         for (Golfer i : personalDB.getGolfers()) {
-            MenuOption menuOption = new MenuOption(i.toString(), () -> login(i));
-            opts.add(menuOption);
+            opts.add(new MenuOption(i.toString(), () -> login(i)));
         }
 
         opts.add(new MenuOption("<create>", () -> {
-- 
cgit v1.2.3