diff --git a/bin/ATM.class b/bin/ATM.class deleted file mode 100644 index 76543bf..0000000 Binary files a/bin/ATM.class and /dev/null differ diff --git a/bin/ATMCaseStudy.class b/bin/ATMCaseStudy.class deleted file mode 100644 index 607c10d..0000000 Binary files a/bin/ATMCaseStudy.class and /dev/null differ diff --git a/bin/Account.class b/bin/Account.class deleted file mode 100644 index 5d2d636..0000000 Binary files a/bin/Account.class and /dev/null differ diff --git a/bin/BalanceInquiry.class b/bin/BalanceInquiry.class deleted file mode 100644 index 48f8e6a..0000000 Binary files a/bin/BalanceInquiry.class and /dev/null differ diff --git a/bin/BankDatabase.class b/bin/BankDatabase.class deleted file mode 100644 index 429aec1..0000000 Binary files a/bin/BankDatabase.class and /dev/null differ diff --git a/bin/CashDispenser.class b/bin/CashDispenser.class deleted file mode 100644 index b8cedba..0000000 Binary files a/bin/CashDispenser.class and /dev/null differ diff --git a/bin/Deposit.class b/bin/Deposit.class deleted file mode 100644 index 57b0c3f..0000000 Binary files a/bin/Deposit.class and /dev/null differ diff --git a/bin/DepositSlot.class b/bin/DepositSlot.class deleted file mode 100644 index a2664ad..0000000 Binary files a/bin/DepositSlot.class and /dev/null differ diff --git a/bin/Keypad.class b/bin/Keypad.class deleted file mode 100644 index 9b066e2..0000000 Binary files a/bin/Keypad.class and /dev/null differ diff --git a/bin/Screen.class b/bin/Screen.class deleted file mode 100644 index a036758..0000000 Binary files a/bin/Screen.class and /dev/null differ diff --git a/bin/Transaction.class b/bin/Transaction.class deleted file mode 100644 index 1330b55..0000000 Binary files a/bin/Transaction.class and /dev/null differ diff --git a/bin/Withdrawal.class b/bin/Withdrawal.class deleted file mode 100644 index 291d645..0000000 Binary files a/bin/Withdrawal.class and /dev/null differ diff --git a/bin/code/Business_logic/Account.class b/bin/code/Business_logic/Account.class new file mode 100644 index 0000000..e82fcb7 Binary files /dev/null and b/bin/code/Business_logic/Account.class differ diff --git a/bin/code/Business_logic/BalanceInquiry.class b/bin/code/Business_logic/BalanceInquiry.class new file mode 100644 index 0000000..dccb349 Binary files /dev/null and b/bin/code/Business_logic/BalanceInquiry.class differ diff --git a/bin/code/Business_logic/Deposit.class b/bin/code/Business_logic/Deposit.class new file mode 100644 index 0000000..daf298a Binary files /dev/null and b/bin/code/Business_logic/Deposit.class differ diff --git a/bin/code/Business_logic/Euro.class b/bin/code/Business_logic/Euro.class new file mode 100644 index 0000000..4cf69b7 Binary files /dev/null and b/bin/code/Business_logic/Euro.class differ diff --git a/bin/code/Business_logic/Transaction.class b/bin/code/Business_logic/Transaction.class new file mode 100644 index 0000000..2fca7e9 Binary files /dev/null and b/bin/code/Business_logic/Transaction.class differ diff --git a/bin/code/Business_logic/Withdrawal.class b/bin/code/Business_logic/Withdrawal.class new file mode 100644 index 0000000..e909201 Binary files /dev/null and b/bin/code/Business_logic/Withdrawal.class differ diff --git a/bin/code/Database/BankDatabase.class b/bin/code/Database/BankDatabase.class new file mode 100644 index 0000000..852a0cc Binary files /dev/null and b/bin/code/Database/BankDatabase.class differ diff --git a/bin/code/GUI/ATM.class b/bin/code/GUI/ATM.class new file mode 100644 index 0000000..55a297e Binary files /dev/null and b/bin/code/GUI/ATM.class differ diff --git a/bin/code/GUI/ATMCaseStudy.class b/bin/code/GUI/ATMCaseStudy.class new file mode 100644 index 0000000..83657c8 Binary files /dev/null and b/bin/code/GUI/ATMCaseStudy.class differ diff --git a/bin/code/GUI/CashDispenser.class b/bin/code/GUI/CashDispenser.class new file mode 100644 index 0000000..6790016 Binary files /dev/null and b/bin/code/GUI/CashDispenser.class differ diff --git a/bin/code/GUI/DepositSlot.class b/bin/code/GUI/DepositSlot.class new file mode 100644 index 0000000..40194ba Binary files /dev/null and b/bin/code/GUI/DepositSlot.class differ diff --git a/bin/code/GUI/Keypad.class b/bin/code/GUI/Keypad.class new file mode 100644 index 0000000..a2e161f Binary files /dev/null and b/bin/code/GUI/Keypad.class differ diff --git a/bin/code/GUI/Screen.class b/bin/code/GUI/Screen.class new file mode 100644 index 0000000..51b665f Binary files /dev/null and b/bin/code/GUI/Screen.class differ diff --git a/componenti.txt b/componenti.txt new file mode 100644 index 0000000..846034f --- /dev/null +++ b/componenti.txt @@ -0,0 +1,3 @@ +Riccardo Traversa 5003659 +Massimo Mantovani 5186259 +Leonardo De Vincenzi 4631057 diff --git a/src/Account.java b/src/code/Business_logic/Account.java similarity index 78% rename from src/Account.java rename to src/code/Business_logic/Account.java index c308eca..433c7d7 100644 --- a/src/Account.java +++ b/src/code/Business_logic/Account.java @@ -1,3 +1,4 @@ +package code.Business_logic; // Account.java // Represents a bank account @@ -5,12 +6,12 @@ public class Account { private int accountNumber; // account number private int pin; // PIN for authentication - private double availableBalance; // funds available for withdrawal - private double totalBalance; // funds available + pending deposits + private Euro availableBalance; // funds available for withdrawal + private Euro totalBalance; // funds available + pending deposits // Account constructor initializes attributes public Account( int theAccountNumber, int thePIN, - double theAvailableBalance, double theTotalBalance ) + Euro theAvailableBalance, Euro theTotalBalance ) { accountNumber = theAccountNumber; pin = thePIN; @@ -28,28 +29,28 @@ public boolean validatePIN( int userPIN ) } // end method validatePIN // returns available balance - public double getAvailableBalance() + public Euro getAvailableBalance() { return availableBalance; } // end getAvailableBalance // returns the total balance - public double getTotalBalance() + public Euro getTotalBalance() { return totalBalance; } // end method getTotalBalance // credits an amount to the account - public void credit( double amount ) + public void credit( Euro amount ) { - totalBalance += amount; // add to total balance + totalBalance=totalBalance.somma(amount) ; // add to total balance } // end method credit // debits an amount from the account - public void debit( double amount ) + public void debit( Euro amount ) { - availableBalance -= amount; // subtract from available balance - totalBalance -= amount; // subtract from total balance + availableBalance = availableBalance.sottrai(amount); // subtract from available balance + totalBalance = totalBalance.sottrai(amount); // subtract from total balance } // end method debit // returns account number diff --git a/src/BalanceInquiry.java b/src/code/Business_logic/BalanceInquiry.java similarity index 94% rename from src/BalanceInquiry.java rename to src/code/Business_logic/BalanceInquiry.java index d45fa6a..90f3b45 100644 --- a/src/BalanceInquiry.java +++ b/src/code/Business_logic/BalanceInquiry.java @@ -1,6 +1,10 @@ +package code.Business_logic; // BalanceInquiry.java // Represents a balance inquiry ATM transaction +import code.Database.BankDatabase; +import code.GUI.Screen; + public class BalanceInquiry extends Transaction { // BalanceInquiry constructor @@ -18,11 +22,11 @@ public void execute() Screen screen = getScreen(); // get the available balance for the account involved - double availableBalance = + Euro availableBalance = bankDatabase.getAvailableBalance( getAccountNumber() ); // get the total balance for the account involved - double totalBalance = + Euro totalBalance = bankDatabase.getTotalBalance( getAccountNumber() ); // display the balance information on the screen diff --git a/src/Deposit.java b/src/code/Business_logic/Deposit.java similarity index 86% rename from src/Deposit.java rename to src/code/Business_logic/Deposit.java index 916ef70..1db0993 100644 --- a/src/Deposit.java +++ b/src/code/Business_logic/Deposit.java @@ -1,12 +1,18 @@ +package code.Business_logic; // Deposit.java // Represents a deposit ATM transaction +import code.Database.BankDatabase; +import code.GUI.DepositSlot; +import code.GUI.Keypad; +import code.GUI.Screen; + public class Deposit extends Transaction { - private double amount; // amount to deposit + private Euro amount; // amount to deposit private Keypad keypad; // reference to keypad private DepositSlot depositSlot; // reference to deposit slot - private final static int CANCELED = 0; // constant for cancel option + private Euro CANCELED = new Euro(0); // constant for cancel option // Deposit constructor public Deposit( int userAccountNumber, Screen atmScreen, @@ -35,7 +41,7 @@ public void execute() // request deposit envelope containing specified amount screen.displayMessage( "\nPlease insert a deposit envelope containing " ); - screen.displayDollarAmount( amount ); + screen.displayDollarAmount( amount); screen.displayMessageLine( "." ); // receive deposit envelope @@ -47,7 +53,7 @@ public void execute() screen.displayMessageLine( "\nYour envelope has been " + "received.\nNOTE: The money just deposited will not " + "be available until we verify the amount of any " + - "enclosed cash and your checks clear." ); + "enclosed cash and your checks clear" ); // credit account to reflect the deposit bankDatabase.credit( getAccountNumber(), amount ); @@ -65,21 +71,21 @@ public void execute() } // end method execute // prompt user to enter a deposit amount in cents - private double promptForDepositAmount() + private Euro promptForDepositAmount() { Screen screen = getScreen(); // get reference to screen // display the prompt screen.displayMessage( "\nPlease enter a deposit amount in " + "CENTS (or 0 to cancel): " ); - int input = keypad.getInput(); // receive input of deposit amount + Euro input = new Euro((double)keypad.getInput()/100); // receive input of deposit amount // check whether the user canceled or entered a valid amount - if ( input == CANCELED ) + if ( input.ugualeA(CANCELED) ) return CANCELED; else { - return ( double ) input / 100; // return dollar amount + return input; // return dollar amount } // end else } // end method promptForDepositAmount } // end class Deposit diff --git a/src/code/Business_logic/Euro.java b/src/code/Business_logic/Euro.java new file mode 100644 index 0000000..f518760 --- /dev/null +++ b/src/code/Business_logic/Euro.java @@ -0,0 +1,48 @@ +package code.Business_logic; +public class Euro { + + + private long valore; + + public Euro(long euro, long cent) { + if (euro >= 0) { + valore = euro*100 + cent; + } else { + valore = euro*100 - cent; + } + } + + public Euro(double d) { + valore = (long)(d*100); + } + + public long getValore() { + return valore; + } + + public Euro somma(Euro e) { + this.valore = this.valore + e.getValore(); + return this; + } + + public Euro sottrai(Euro e) { + this.valore = this.valore - e.getValore(); + return this; + } + + public boolean ugualeA(Euro e){ + if (valore == e.getValore()) + return true; + else return false; + } + + public boolean minoreDi(Euro e){ + if (valore <= e.getValore()) + return true; + else return false; + } + + public String stampa(){ + return (double)valore/100 +" euro"; + } +} \ No newline at end of file diff --git a/src/Transaction.java b/src/code/Business_logic/Transaction.java similarity index 96% rename from src/Transaction.java rename to src/code/Business_logic/Transaction.java index 508fea8..5256dca 100644 --- a/src/Transaction.java +++ b/src/code/Business_logic/Transaction.java @@ -1,6 +1,10 @@ +package code.Business_logic; // Transaction.java // Abstract superclass Transaction represents an ATM transaction +import code.Database.BankDatabase; +import code.GUI.Screen; + public abstract class Transaction { private int accountNumber; // indicates account involved diff --git a/src/Withdrawal.java b/src/code/Business_logic/Withdrawal.java similarity index 88% rename from src/Withdrawal.java rename to src/code/Business_logic/Withdrawal.java index 6e0af62..90ee7ca 100644 --- a/src/Withdrawal.java +++ b/src/code/Business_logic/Withdrawal.java @@ -1,9 +1,15 @@ +package code.Business_logic; // Withdrawal.java // Represents a withdrawal ATM transaction +import code.Database.BankDatabase; +import code.GUI.CashDispenser; +import code.GUI.Keypad; +import code.GUI.Screen; + public class Withdrawal extends Transaction { - private int amount; // amount to withdraw + private Euro amount; // amount to withdraw private Keypad keypad; // reference to keypad private CashDispenser cashDispenser; // reference to cash dispenser @@ -27,7 +33,7 @@ public Withdrawal( int userAccountNumber, Screen atmScreen, public void execute() { boolean cashDispensed = false; // cash was not dispensed yet - double availableBalance; // amount available for withdrawal + Euro availableBalance; // amount available for withdrawal // get references to bank database and screen BankDatabase bankDatabase = getBankDatabase(); @@ -40,22 +46,22 @@ public void execute() amount = displayMenuOfAmounts(); // check whether user chose a withdrawal amount or canceled - if ( amount != CANCELED ) + if ( !amount.ugualeA(new Euro(CANCELED))) { // get available balance of account involved availableBalance = bankDatabase.getAvailableBalance( getAccountNumber() ); // check whether the user has enough money in the account - if ( amount <= availableBalance ) + if ( amount.minoreDi(availableBalance) || amount.ugualeA(availableBalance) ) { // check whether the cash dispenser has enough money - if ( cashDispenser.isSufficientCashAvailable( amount ) ) + if ( cashDispenser.isSufficientCashAvailable( (int)amount.getValore()) ) { // update the account involved to reflect withdrawal bankDatabase.debit( getAccountNumber(), amount ); - cashDispenser.dispenseCash( amount ); // dispense cash + cashDispenser.dispenseCash( (int)amount.getValore() ); // dispense cash cashDispensed = true; // cash was dispensed // instruct user to take cash @@ -79,13 +85,13 @@ public void execute() screen.displayMessageLine( "\nCanceling transaction..." ); return; // return to main menu because user canceled } // end else - } while ( !cashDispensed ); + } while ( !cashDispensed ); } // end method execute // display a menu of withdrawal amounts and the option to cancel; // return the chosen amount or 0 if the user chooses to cancel - private int displayMenuOfAmounts() + private Euro displayMenuOfAmounts() { int userChoice = 0; // local variable to store return value @@ -128,7 +134,7 @@ private int displayMenuOfAmounts() } // end switch } // end while - return userChoice; // return withdrawal amount or CANCELED + return new Euro(userChoice); // return withdrawal amount or CANCELED } // end method displayMenuOfAmounts } // end class Withdrawal diff --git a/src/BankDatabase.java b/src/code/Database/BankDatabase.java similarity index 84% rename from src/BankDatabase.java rename to src/code/Database/BankDatabase.java index 3978497..2d27293 100644 --- a/src/BankDatabase.java +++ b/src/code/Database/BankDatabase.java @@ -1,6 +1,10 @@ +package code.Database; // BankDatabase.java // Represents the bank account information database +import code.Business_logic.Account; +import code.Business_logic.Euro; + public class BankDatabase { private Account accounts[]; // array of Accounts @@ -9,8 +13,9 @@ public class BankDatabase public BankDatabase() { accounts = new Account[ 2 ]; // just 2 accounts for testing - accounts[ 0 ] = new Account( 12345, 54321, 1000.0, 1200.0 ); - accounts[ 1 ] = new Account( 98765, 56789, 200.0, 200.0 ); + accounts[ 0 ] = new Account(12345, 54321, new Euro(1000, 0),new Euro(1200,0)); + accounts[ 1 ] = new Account(98765, 56789, new Euro(200, 0),new Euro(200,0)); + } // end no-argument BankDatabase constructor // retrieve Account object containing specified account number @@ -42,25 +47,25 @@ public boolean authenticateUser( int userAccountNumber, int userPIN ) } // end method authenticateUser // return available balance of Account with specified account number - public double getAvailableBalance( int userAccountNumber ) + public Euro getAvailableBalance( int userAccountNumber ) { return getAccount( userAccountNumber ).getAvailableBalance(); } // end method getAvailableBalance // return total balance of Account with specified account number - public double getTotalBalance( int userAccountNumber ) + public Euro getTotalBalance( int userAccountNumber ) { return getAccount( userAccountNumber ).getTotalBalance(); } // end method getTotalBalance // credit an amount to Account with specified account number - public void credit( int userAccountNumber, double amount ) + public void credit( int userAccountNumber, Euro amount ) { - getAccount( userAccountNumber ).credit( amount ); + getAccount( userAccountNumber ).credit(amount); } // end method credit - // debit an amount from of Account with specified account number - public void debit( int userAccountNumber, double amount ) + // debit an amount from of Account with specified account number12345 + public void debit( int userAccountNumber, Euro amount ) { getAccount( userAccountNumber ).debit( amount ); } // end method debit diff --git a/src/ATM.java b/src/code/GUI/ATM.java similarity index 97% rename from src/ATM.java rename to src/code/GUI/ATM.java index aa3d187..0a49a19 100644 --- a/src/ATM.java +++ b/src/code/GUI/ATM.java @@ -1,6 +1,13 @@ +package code.GUI; // ATM.java // Represents an automated teller machine +import code.Business_logic.BalanceInquiry; +import code.Business_logic.Deposit; +import code.Business_logic.Transaction; +import code.Business_logic.Withdrawal; +import code.Database.BankDatabase; + public class ATM { private boolean userAuthenticated; // whether user is authenticated diff --git a/src/ATMCaseStudy.java b/src/code/GUI/ATMCaseStudy.java similarity index 98% rename from src/ATMCaseStudy.java rename to src/code/GUI/ATMCaseStudy.java index b9033bd..5beedde 100644 --- a/src/ATMCaseStudy.java +++ b/src/code/GUI/ATMCaseStudy.java @@ -1,3 +1,4 @@ +package code.GUI; // ATMCaseStudy.java // Driver program for the ATM case study diff --git a/src/CashDispenser.java b/src/code/GUI/CashDispenser.java similarity index 92% rename from src/CashDispenser.java rename to src/code/GUI/CashDispenser.java index b249faf..548ac3e 100644 --- a/src/CashDispenser.java +++ b/src/code/GUI/CashDispenser.java @@ -1,3 +1,4 @@ +package code.GUI; // CashDispenser.java // Represents the cash dispenser of the ATM @@ -16,14 +17,14 @@ public CashDispenser() // simulates dispensing of specified amount of cash public void dispenseCash( int amount ) { - int billsRequired = amount / 20; // number of $20 bills required + int billsRequired = (amount/100) / 20; // number of $20 bills required count -= billsRequired; // update the count of bills } // end method dispenseCash // indicates whether cash dispenser can dispense desired amount public boolean isSufficientCashAvailable( int amount ) { - int billsRequired = amount / 20; // number of $20 bills required + int billsRequired = (amount/100) / 20; // number of $20 bills required if ( count >= billsRequired ) return true; // enough bills available diff --git a/src/DepositSlot.java b/src/code/GUI/DepositSlot.java similarity index 98% rename from src/DepositSlot.java rename to src/code/GUI/DepositSlot.java index 64e02c2..bde0339 100644 --- a/src/DepositSlot.java +++ b/src/code/GUI/DepositSlot.java @@ -1,3 +1,4 @@ +package code.GUI; // DepositSlot.java // Represents the deposit slot of the ATM diff --git a/src/Keypad.java b/src/code/GUI/Keypad.java similarity index 98% rename from src/Keypad.java rename to src/code/GUI/Keypad.java index cd035c7..f0f716c 100644 --- a/src/Keypad.java +++ b/src/code/GUI/Keypad.java @@ -1,3 +1,4 @@ +package code.GUI; // Keypad.java // Represents the keypad of the ATM import java.util.Scanner; // program uses Scanner to obtain user input diff --git a/src/Screen.java b/src/code/GUI/Screen.java similarity index 91% rename from src/Screen.java rename to src/code/GUI/Screen.java index 44d3f30..24d8edb 100644 --- a/src/Screen.java +++ b/src/code/GUI/Screen.java @@ -1,6 +1,9 @@ +package code.GUI; // Screen.java // Represents the screen of the ATM +import code.Business_logic.Euro; + public class Screen { // displays a message without a carriage return @@ -16,9 +19,9 @@ public void displayMessageLine( String message ) } // end method displayMessageLine // display a dollar amount - public void displayDollarAmount( double amount ) + public void displayDollarAmount( Euro amount ) { - System.out.printf( "$%,.2f", amount ); + System.out.printf( amount.stampa() ); } // end method displayDollarAmount } // end class Screen