Laboratorio 3

.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*

README.md

@@ -23,3 +23,5 @@ Avviando il main() della classe ATMCaseStudy, viene richiesto l’inserimento de
 - Numero di conto = 98765, PIN = 56789
 
 ---------------------------------------------------------------------------
+
+Stiamo per fare un conflitto

componenti.txt

@@ -0,0 +1,2 @@
+Lorenzo Mecca - 5317293
+Carlo Arturo Zecca - 5228599

src/ATM.java → src/code/Business_logic/ATM.java

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

src/ATMCaseStudy.java → src/code/Business_logic/ATMCaseStudy.java

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

src/Account.java → src/code/Business_logic/Account.java

@@ -1,16 +1,17 @@
+package code.Business_logic;
 // 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 +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.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/BalanceInquiry.java → src/code/Business_logic/BalanceInquiry.java

@@ -1,6 +1,11 @@
+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 +23,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

src/CashDispenser.java → src/code/Business_logic/CashDispenser.java

@@ -1,3 +1,4 @@
+package code.Business_logic;
 // CashDispenser.java
 // Represents the cash dispenser of the ATM
 
@@ -14,18 +15,18 @@ 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
+      int billsRequired = (int)(amount.getValore() / 20) / 100; // 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
+      int billsRequired = (int)(amount.getValore() / 20) / 100; // number of $20 bills required
 
-      if ( count >= billsRequired  )
+      if ( count >= billsRequired)
          return true; // enough bills available
       else 
          return false; // not enough bills available

src/Deposit.java → src/code/Business_logic/Deposit.java

@@ -1,9 +1,15 @@
+package code.Business_logic;
 // Deposit.java
 // Represents a deposit ATM transaction
 
+import code.Database.BankDatabase;
+
+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
@@ -30,7 +36,7 @@ public void execute()
       amount = promptForDepositAmount(); // get deposit amount from user
 
       // check whether user entered a deposit amount or canceled
-      if ( amount != CANCELED )
+      if ( amount.getValore() != CANCELED )
       {
          // request deposit envelope containing specified amount
          screen.displayMessage( 
@@ -65,7 +71,7 @@ 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
 
@@ -76,10 +82,10 @@ private double promptForDepositAmount()
 
       // check whether the user canceled or entered a valid amount
       if ( input == CANCELED ) 
-         return CANCELED;
+         return new Euro(0, CANCELED);
       else
       {
-         return ( double ) input / 100; // return dollar amount 
+         return new Euro(input / 100, input % 100); // return dollar amount 
       } // end else
    } // end method promptForDepositAmount
 } // end class Deposit

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,47 @@
+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";
+	}
+}

src/Transaction.java → src/code/Business_logic/Transaction.java

@@ -1,6 +1,11 @@
+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

src/Withdrawal.java → src/code/Business_logic/Withdrawal.java

@@ -1,9 +1,16 @@
+package code.Business_logic;
 // Withdrawal.java
 // Represents a withdrawal ATM transaction
 
+
+import code.Database.BankDatabase;
+
+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 +34,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 +47,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() );
+               bankDatabase.getAvailableBalance(getAccountNumber());
 
             // check whether the user has enough money in the account 
-            if ( amount <= availableBalance )
+            if ( amount.minoreDi(availableBalance))
             {   
                // check whether the cash dispenser has enough money
-               if ( cashDispenser.isSufficientCashAvailable( amount ) )
+               if ( cashDispenser.isSufficientCashAvailable(amount))
                {
                   // update the account involved to reflect withdrawal
-                  bankDatabase.debit( getAccountNumber(), amount );
+                  bankDatabase.debit(getAccountNumber(), amount);
 
-                  cashDispenser.dispenseCash( amount ); // dispense cash
+                  cashDispenser.dispenseCash(amount); // dispense cash
                   cashDispensed = true; // cash was dispensed
 
                   // instruct user to take cash
@@ -85,17 +92,17 @@ public void 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
+      Euro userChoice = new Euro(0); // local variable to store return value
 
       Screen screen = getScreen(); // get screen reference
 
       // array of amounts to correspond to menu numbers
       int amounts[] = { 0, 20, 40, 60, 100, 200 };
 
       // loop while no valid choice has been made
-      while ( userChoice == 0 )
+      while ( userChoice.ugualeA(new Euro(0)))
       {
          // display the menu
          screen.displayMessageLine( "\nWithdrawal Menu:" );
@@ -117,10 +124,10 @@ private int displayMenuOfAmounts()
             case 3: // corresponding amount from amounts array
             case 4:
             case 5:
-               userChoice = amounts[ input ]; // save user's choice
+               userChoice = new Euro(amounts[input]); // save user's choice
                break;       
             case CANCELED: // the user chose to cancel
-               userChoice = CANCELED; // save user's choice
+               userChoice = new Euro(CANCELED); // save user's choice
                break;
             default: // the user did not enter a value from 1-6
                screen.displayMessageLine(