Fix some bugs related to insert and extract card

Author: talktoyeet

ATMFrame.java

@@ -17,7 +17,6 @@ public class ATMFrame extends JFrame implements ActionListener {
     // Static variable to hold the single instance of ATMFrame
     private static ATMFrame instance;
     private static Screen screen; // ATM's screen
-    private final Keypad keypad; // ATM's keypad
     private final CardPanel cardPanel;
     private final CashDispenser cashDispenser; // ATM's cash dispenser
     private final BankDatabase bankDatabase; // account information database
@@ -59,36 +58,30 @@ private ATMFrame() {
         userAuthenticated = false; // user is not authenticated to start
         currentAccountNumber = 0; // no current account number to start
         screen = new Screen(); // create screen
-        keypad = new Keypad(); // create keypad
         cashDispenser = new CashDispenser(); // create cash dispenser
         bankDatabase = new BankDatabase(); // create acct info database
-        GlobalState.ATMState = "waitingCard"; // Change ui state to login
-        screen.displayMessageLine("Welcome!");
-        screen.displayMessageLine("Please insert your card");
-
-        // Create a timer to display the account number prompt after 3 seconds (3000 milliseconds)
-        /**
-        Timer timer = new Timer(3000, new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                screen.displayMessage("Please enter your account number: ");
-                ((Timer)e.getSource()).stop(); // Stop the timer after it runs once
-            }
-        });
-        timer.setRepeats(false); // Only execute once
-        timer.start(); // Start the timer
-         **/
+        welcomeMessage();
 
     }
 
+
+    private void wait(int mSec) {
+        try {
+            Thread.sleep(mSec); // Wait for 3000 milliseconds (3 seconds)
+        } catch (InterruptedException e) {
+            e.printStackTrace(); // Handle the exception
+        }
+    }
+
+
     static void displayMainMenu() {
         GlobalState.ATMState = "Menu";
         screen.clearScreen();
         screen.displayMessageLine("Main menu:");
         screen.displayMessageLine("1 - View my balance");
         screen.displayMessageLine("2 - Withdraw cash");
         screen.displayMessageLine("3 - Transfer");
-        screen.displayMessageLine("4 - Exit\n");
+        screen.displayMessageLine("Eject card to exit ATM\n");
         screen.displayMessage("Enter a choice: ");
 
     } // end method displayMainMenu
@@ -105,6 +98,17 @@ public static void appendMessage(String text) {
         messageField.appendMessage(text);
     }
 
+    public static void welcomeMessage() {
+        screen.clearScreen();
+        GlobalState.ATMState = "waitingCard"; // Change ui state to login
+        screen.displayMessageLine("Welcome!");
+        screen.displayMessageLine("Please insert your card");
+    }
+
+    public static void loginMessage() {
+        screen.displayMessage("Please Enter your account number: ");
+    }
+
     private void authenticateUser(int input) {
          GlobalState.allowDecimal = false;
     if (!isPinInput) {
@@ -150,22 +154,14 @@ private void menuSelection(int choice) {
                 break;
             case WITHDRAWAL:
                 GlobalState.ATMState = "Withdrawal";
-                temp = new Withdrawal(currentAccountNumber, screen, bankDatabase, keypad, cashDispenser);
+                temp = new Withdrawal(currentAccountNumber, screen, bankDatabase, cashDispenser);
                 temp.execute(0);
                 break;
             case TRANSFER:
                 GlobalState.ATMState = "Transfer";
-                temp = new Transfer(currentAccountNumber, screen, bankDatabase, keypad);
+                temp = new Transfer(currentAccountNumber, screen, bankDatabase);
                 temp.execute(0);
                 break;
-            case EXIT: // user chose to terminate session
-                screen.clearScreen();
-                screen.displayMessageLine("\nExiting the system...");
-                screen.displayMessageLine("\nWelcome!");
-                screen.displayMessage("\nPlease enter your account number: ");
-                GlobalState.ATMState = "login";
-                userAuthenticated = false;
-                break;
             default: // user did not enter an integer from 1-4
                 screen.clearScreen();
                 screen.displayMessageLine(
@@ -190,21 +186,15 @@ public void actionPerformed(ActionEvent e) {
             if ("login".equals(GlobalState.ATMState)) {
                 GlobalState.allowDecimal = false;
                 screen.clearScreen();
-                screen.displayMessageLine("\nWelcome!");
-                screen.displayMessage("\nPlease enter your account number: ");
+                screen.displayMessage("Please enter your account number: ");
                 accountNumber = 0; // Reset account number
                 isPinInput = false; // Reset flag for next authentication attempt
                 userAuthenticated = false;
             } else if ("Menu".equals(GlobalState.ATMState)) {
-                GlobalState.allowDecimal = false;
-                screen.clearScreen();
-                screen.displayMessageLine("\nWelcome!");
-                screen.displayMessage("\nPlease enter your account number: ");
-                GlobalState.ATMState = "login";
-            } else if ("waitingCard".equals(GlobalState.ATMState)){
 
-            }
-                else {
+            } else if ("waitingCard".equals(GlobalState.ATMState)) {
+
+            } else {
                 GlobalState.allowDecimal = false;
                 displayMainMenu();
             }
@@ -226,20 +216,50 @@ public void actionPerformed(ActionEvent e) {
         } else if (source == keypadPanel.numberButtons[11]) { // "00" Button
             textField.appendInput("00"); // Append "00" to user input
 
-        } else if (source == cardPanel.insertCardButton){
+        } else if (source == cardPanel.insertCardButton) {
             System.out.println("aaa");
-            if ("waitingCard".equals(GlobalState.ATMState)){
+            if ("waitingCard".equals(GlobalState.ATMState)) {
                 screen.clearScreen();
                 screen.displayMessageLine("Card read successful!");
                 GlobalState.ATMState = "login"; // Change ui state to login
+                loginMessage();
+            }
+        } else if (source == cardPanel.ejectCardButton) {
+            if (!"waitingCard".equals(GlobalState.ATMState)) {
+                startCardEjectTimer();
+
             }
-        } else if (source == cardPanel.ejectCardButton){
+        }
+    }
+
+    private void startCardEjectTimer() {
+        if (!"waitingCard".equals(GlobalState.ATMState)) {
+            // Display the initial message immediately
             screen.clearScreen();
             screen.displayMessageLine("Ejecting card...");
-            GlobalState.ATMState = "waitingCard";
+
+            // Create a timer to execute actions after 3 seconds
+            Timer timer = new Timer(3000, x -> {
+                screen.clearScreen(); // Clear the screen after 3 seconds
+                screen.displayMessageLine("Remember to take your card!"); // Display this message
+
+                // Start another timer to wait before calling welcomeMessage
+                Timer welcomeTimer = new Timer(3000, y -> {
+                    welcomeMessage(); // Call welcomeMessage after another 3 seconds
+                });
+                welcomeTimer.setRepeats(false); // Ensure this timer only runs once
+                welcomeTimer.start(); // Start the welcome timer
+            });
+
+            timer.setRepeats(false); // Ensure the first timer only runs once
+            timer.start(); // Start the first timer
+            GlobalState.ATMState = "waitingCard"; // Update the state
         }
     }
 
+
+
+
     private void handler(String text) {
         System.out.println(GlobalState.ATMState);
         if ("login".equals(GlobalState.ATMState)) {

BalanceInquiry.java

@@ -31,8 +31,8 @@ public void execute() {
 
         // display the balance information on the screen
         screen.clearScreen();
-        screen.displayMessageLine("\nBalance Information:");
-        screen.displayMessage(" - Account type: ");
+        screen.displayMessageLine("Balance Information:");
+        screen.displayMessage("\n - Account type: ");
         screen.displayMessage(accountType);
         screen.displayMessage("\n - Available balance: ");
         screen.displayDollarAmount(availableBalance);

CardPanel.java

@@ -11,7 +11,7 @@ public CardPanel(ActionListener actionListener) {
         this.setLayout(new FlowLayout());
         //this.setBackground(Color.LIGHT_GRAY);
 
-        // Add action listner
+        // Add action listener
         insertCardButton.addActionListener(actionListener);
         ejectCardButton.addActionListener(actionListener);
 

Keypad.java

@@ -3,14 +3,12 @@ public class Transfer extends Transaction {
     private final static int CANCELED = 0;
     private String state = "";
     private double amount; // Amount to be transferred
-    private Keypad keypad; // Keypad for user input
     private int beneficiaryAccountNumber = 0;
 
     // Constructor to initialize the transfer transaction
-    public Transfer(int remitterAccountNumber, Screen atmScreen, BankDatabase atmBankDatabase, Keypad atmKeypad) {
+    public Transfer(int remitterAccountNumber, Screen atmScreen, BankDatabase atmBankDatabase) {
         // Initialize superclass variables
         super(remitterAccountNumber, atmScreen, atmBankDatabase);
-        this.keypad = atmKeypad; // Set the keypad for user input
     }
 
     // Execute the transfer process

Transfer.java

@@ -3,22 +3,20 @@ public class Withdrawal extends Transaction {
     private final static int CANCELED = 5;
     private final static double MAX_WITHDRAWAL = 5000; // maximum cash that can be taken
     private static double ATM_RESERVE = 10000; // ATM reserve amount
-    private int amount; // amount to withdraw
-    private Keypad keypad; // reference to keypad
+    private int amount; // amount to withdraw// reference to keypad
     private CashDispenser cashDispenser; // reference to cash dispenser
     //Withdrawal state
     private String state;
 
     // Withdrawal constructor
     public Withdrawal(int userAccountNumber, Screen atmScreen,
-                      BankDatabase atmBankDatabase, Keypad atmKeypad,
+                      BankDatabase atmBankDatabase,
                       CashDispenser atmCashDispenser) {
         // initialize superclass variables
         super(userAccountNumber, atmScreen, atmBankDatabase);
 
         // initialize references to keypad and cash dispenser
         this.state = "";
-        keypad = atmKeypad;
         cashDispenser = atmCashDispenser;
     } // end Withdrawal constructor
 
@@ -46,22 +44,22 @@ public void execute(int input) {
                 case 4: // user chose to input a preferred cash amount
                     state = "waitingPreferredAmount";
                     screen.clearScreen();
-                    screen.displayMessage("\n*Less or equal $5000*");
+                    screen.displayMessage("*Less or equal $5000*");
                     screen.displayMessage("Enter your preferred cash amount (must be in $100, $ 500, or $1000 increments): ");
                     break;
                 case CANCELED: // the user chose to cancel
                     userChoice = CANCELED; // save user's choice
                     break;
                 default: // the user did not enter a value from 1-6
                     screen.clearScreen();
-                    screen.displayMessageLine("\nInvalid selection. Try again.");
+                    screen.displayMessageLine("Invalid selection. Try again.");
                     returnMainMenu();
             }
         } else if ("waitingPreferredAmount".equals(state)) {
             int preferredAmount = checkPreferredCashAmount(input);
             if (preferredAmount == 0) {
                 screen.clearScreen();
-                screen.displayMessageLine("\nInvalid amount. Please enter a valid amount.");
+                screen.displayMessageLine("Invalid amount. Please enter a valid amount.");
                 returnMainMenu();
             } else runWithdrawal(preferredAmount);
 
@@ -85,15 +83,15 @@ private void runWithdrawal(int amount) {
                 if (ATM_RESERVE < amount) {
                     // Not enough cash in the ATM reserve
                     screen.clearScreen();
-                    screen.displayMessageLine("\nATM cash not enough, now available ($" + ATM_RESERVE + ").");
+                    screen.displayMessageLine("ATM cash not enough, now available ($" + ATM_RESERVE + ").");
                     screen.displayMessageLine("Please wait for replenishment.");
                     disableWithdrawals(); // Disable all withdrawals momentarily
                 } else if (cashDispenser.isSufficientCashAvailable(amount)) {
                     // Update ATM reserve after successful withdrawal
                     bankDatabase.debit(getAccountNumber(), amount);
                     ATM_RESERVE -= amount; // decrease ATM reserve
                     screen.clearScreen();
-                    screen.displayMessageLine("\nPlease take your cash now.");
+                    screen.displayMessageLine("Please take your cash now.");
                     dispenseCash(amount); // dispense cash
                 } else { // cash dispenser does not have enough cash
                     screen.displayMessageLine("\nInsufficient cash available in the ATM." +
@@ -124,7 +122,7 @@ private void dispenseCash(int amount) {
         }
 
         // Display the dispensed amounts
-        StringBuilder dispensedMessage = new StringBuilder("\nDispensed:\n");
+        StringBuilder dispensedMessage = new StringBuilder("Dispensed:\n");
         for (int i = 0; i < counts.length; i++) {
             if (counts[i] > 0) {
                 dispensedMessage.append("$").append(denominations[i]).append(" x ").append(counts[i]).append("\n");