Feature

.gitignore

@@ -0,0 +1,24 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*

.vscode/settings.json

@@ -2,6 +2,8 @@
     "java.project.sourcePaths": ["src"],
     "java.project.outputPath": "bin",
     "java.project.referencedLibraries": [
-        "lib/**/*.jar"
+        "lib/**/*.jar",
+        "c:\\Users\\cacci\\.m2\\repository\\junit\\junit\\4.13.2\\junit-4.13.2.jar",
+        "c:\\Users\\cacci\\.m2\\repository\\org\\hamcrest\\hamcrest-core\\1.3\\hamcrest-core-1.3.jar"
     ]
 }

componenti.txt

@@ -0,0 +1,2 @@
+Charnelle Sonia Kengue Kentsop S4654827
+Mattia Cacciattore S4850100

src/DepositSlot.java → src/code/Business_logic/DepositSlot.java

@@ -1,3 +1,4 @@
+package code.Business_logic;
 // DepositSlot.java
 // Represents the deposit slot of the ATM
 

src/code/Business_logic/Euro.java

@@ -0,0 +1,49 @@
+package code.Business_logic;
+//ricordare di  aggiungere il .class al file gitignore.
+
+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 minoreOUgualeDi(Euro e){
+        if (valore <= e.getValore())
+            return true;
+        else return false;
+    }
+
+    public String stampa(){
+        return (double)valore/100 +" euro";
+    }
+}

src/Account.java → src/code/Database/Account.java

@@ -1,16 +1,18 @@
+package code.Database;
+import code.Business_logic.Euro;
 // Account.java
 // Represents a bank account
 
 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 +30,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.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.sottrai(amount); // subtract from available balance
+      totalBalance.sottrai(amount); // subtract from total balance
    } // end method debit
 
    // returns account number

src/BankDatabase.java → src/code/Database/BankDatabase.java

@@ -1,3 +1,5 @@
+package code.Database;
+import code.Business_logic.Euro;
 // BankDatabase.java
 // Represents the bank account information database 
 
@@ -9,8 +11,8 @@ 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,27 +44,30 @@ 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 );
    } // end method credit
 
    // debit an amount from of Account with specified account number
-   public void debit( int userAccountNumber, double amount )
+   public void debit( int userAccountNumber, Euro amount )
    {
-      getAccount( userAccountNumber ).debit( amount );
+      // Check if the account has enough money to withdraw
+      if(getAccount( userAccountNumber ).getAvailableBalance().getValore() >= amount.getValore()){
+         getAccount( userAccountNumber ).debit( amount );
+      }
    } // end method debit
 } // end class BankDatabase
 

src/CashDispenser.java → src/code/Database/CashDispenser.java

@@ -1,3 +1,5 @@
+package code.Database;
+import code.Business_logic.Euro;
 // CashDispenser.java
 // Represents the cash dispenser of the ATM
 
@@ -14,16 +16,16 @@ public CashDispenser()
    } // end CashDispenser constructor
 
    // simulates dispensing of specified amount of cash
-   public void dispenseCash( int amount )
+   public void dispenseCash( Euro amount )
    {
-      int billsRequired = amount / 20; // number of $20 bills required
+      long billsRequired = (amount.getValore()/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 )
+   public boolean isSufficientCashAvailable( Euro amount )
    {
-      int billsRequired = amount / 20; // number of $20 bills required
+      long billsRequired = (amount.getValore()/100) / 20; // number of $20 bills required
 
       if ( count >= billsRequired  )
          return true; // enough bills available

src/Deposit.java → src/code/Database/Deposit.java

@@ -1,12 +1,19 @@
+package code.Database;
 // Deposit.java
 // Represents a deposit ATM transaction
 
+import code.Business_logic.DepositSlot;
+import code.Business_logic.Euro;
+import code.GUI.Keypad;
+import code.GUI.Screen;
+import code.GUI.Transaction;
+
 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 final static Euro CANCELED = new Euro(0.0); // constant for cancel option
 
    // Deposit constructor
    public Deposit( int userAccountNumber, Screen atmScreen, 
@@ -30,12 +37,12 @@ public void execute()
       amount = promptForDepositAmount(); // get deposit amount from user
 
       // check whether user entered a deposit amount or canceled
-      if ( amount != CANCELED )
+      if (!amount.ugualeA(CANCELED)) 
       {
          // request deposit envelope containing specified amount
          screen.displayMessage( 
             "\nPlease insert a deposit envelope containing " );
-         screen.displayDollarAmount( amount );
+         screen.displayEuroAmount( amount );
          screen.displayMessageLine( "." );
 
          // receive deposit envelope
@@ -64,22 +71,22 @@ public void execute()
       } // end else
    } // end method execute
 
-   // prompt user to enter a deposit amount in cents 
-   private double promptForDepositAmount()
+   // prompt user to enter a deposit amount in euro 
+   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): " );
+         "EURO (or 0 to cancel): " );
       int input = keypad.getInput(); // receive input of deposit amount
 
       // check whether the user canceled or entered a valid amount
-      if ( input == CANCELED ) 
+      if ( input == CANCELED.getValore() ) 
          return CANCELED;
       else
       {
-         return ( double ) input / 100; // return dollar amount 
+         return new Euro(input / 100.0); // return dollar amount 
       } // end else
    } // end method promptForDepositAmount
 } // end class Deposit

src/ATM.java → src/code/GUI/ATM.java

@@ -1,6 +1,12 @@
+package code.GUI;
 // ATM.java
 // Represents an automated teller machine
 
+import code.Business_logic.DepositSlot;
+import code.Database.BankDatabase;
+import code.Database.CashDispenser;
+import code.Database.Deposit;
+
 public class ATM 
 {
    private boolean userAuthenticated; // whether user is authenticated

src/ATMCaseStudy.java → src/code/GUI/ATMCaseStudy.java

@@ -1,3 +1,4 @@
+package code.GUI;
 // ATMCaseStudy.java
 // Driver program for the ATM case study
 

src/BalanceInquiry.java → src/code/GUI/BalanceInquiry.java

@@ -1,5 +1,8 @@
+package code.GUI;
 // BalanceInquiry.java
 // Represents a balance inquiry ATM transaction
+import code.Business_logic.Euro;
+import code.Database.BankDatabase;
 
 public class BalanceInquiry extends Transaction
 {
@@ -18,19 +21,17 @@ public void execute()
       Screen screen = getScreen();
 
       // get the available balance for the account involved
-      double availableBalance = 
-         bankDatabase.getAvailableBalance( getAccountNumber() );
+      Euro availableBalance = bankDatabase.getAvailableBalance( getAccountNumber() );
 
       // get the total balance for the account involved
-      double totalBalance = 
-         bankDatabase.getTotalBalance( getAccountNumber() );
+      Euro totalBalance = bankDatabase.getTotalBalance( getAccountNumber() );
 
       // display the balance information on the screen
       screen.displayMessageLine( "\nBalance Information:" );
       screen.displayMessage( " - Available balance: " ); 
-      screen.displayDollarAmount( availableBalance );
+      screen.displayEuroAmount( availableBalance );
       screen.displayMessage( "\n - Total balance:     " );
-      screen.displayDollarAmount( totalBalance );
+      screen.displayEuroAmount( totalBalance );
       screen.displayMessageLine( "" );
    } // end method execute
 } // end class BalanceInquiry

src/Keypad.java → 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

src/Screen.java → src/code/GUI/Screen.java

@@ -1,3 +1,5 @@
+package code.GUI;
+import code.Business_logic.Euro;
 // Screen.java
 // Represents the screen of the ATM
 
@@ -16,12 +18,20 @@ public void displayMessageLine( String message )
    } // end method displayMessageLine
 
    // display a dollar amount
-   public void displayDollarAmount( double amount )
+   public void displayEuroAmount( Euro amount )
    {
-      System.out.printf( "$%,.2f", amount );   
-   } // end method displayDollarAmount 
+      // Note: \u20ac is the Unicode character for the Euro symbol.
+      System.out.print("Euro ");
+      System.out.printf( "%,.2f", amount.getValore()/100.0 );
+   } // end method displayEuroAmount 
 } // end class Screen
 
+/*In questo modo, il metodo displayEuroAmount accetta un oggetto di tipo Euro e lo formatta 
+correttamente per essere visualizzato sulla schermata dell'ATM. L'importo viene diviso per 100.0
+ perché la rappresentazione interna di Euro è in centesimi.*/
+
+
+
 
 
 /**************************************************************************

src/Transaction.java → src/code/GUI/Transaction.java

@@ -1,6 +1,9 @@
+package code.GUI;
 // Transaction.java
 // Abstract superclass Transaction represents an ATM transaction
 
+import code.Database.BankDatabase;
+
 public abstract class Transaction
 {
    private int accountNumber; // indicates account involved