Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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*
Binary file removed bin/ATM.class
Binary file not shown.
Binary file removed bin/ATMCaseStudy.class
Binary file not shown.
Binary file removed bin/Account.class
Binary file not shown.
Binary file removed bin/BalanceInquiry.class
Binary file not shown.
Binary file removed bin/BankDatabase.class
Binary file not shown.
Binary file removed bin/CashDispenser.class
Binary file not shown.
Binary file removed bin/Deposit.class
Binary file not shown.
Binary file removed bin/DepositSlot.class
Binary file not shown.
Binary file removed bin/Keypad.class
Binary file not shown.
Binary file removed bin/Screen.class
Binary file not shown.
Binary file removed bin/Transaction.class
Binary file not shown.
Binary file removed bin/Withdrawal.class
Binary file not shown.
3 changes: 3 additions & 0 deletions componenti.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Andrea Parisi 5202353
Alessandro Borracino 5027310
Giacomo Carena 5293937
21 changes: 11 additions & 10 deletions src/Account.java → src/code/Buisness_logic/Account.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package code.Buisness_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;
Expand All @@ -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
Expand Down
49 changes: 49 additions & 0 deletions src/code/Buisness_logic/Euro.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package code.Buisness_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";
}
}
16 changes: 10 additions & 6 deletions src/BankDatabase.java → src/code/Database/BankDatabase.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package code.Database;
// BankDatabase.java
// Represents the bank account information database

import code.Buisness_logic.Account;
import code.Buisness_logic.Euro;

public class BankDatabase
{
private Account accounts[]; // array of Accounts
Expand All @@ -9,8 +13,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), new Euro(1200) );
accounts[ 1 ] = new Account( 98765, 56789, new Euro(200), new Euro(200) );
} // end no-argument BankDatabase constructor

// retrieve Account object containing specified account number
Expand Down Expand Up @@ -42,25 +46,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 );
} // 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 );
} // end method debit
Expand Down
3 changes: 3 additions & 0 deletions src/Transaction.java → src/code/Database/Transaction.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package code.Database;
// Transaction.java
// Abstract superclass Transaction represents an ATM transaction

import code.GUI.Screen;

public abstract class Transaction
{
private int accountNumber; // indicates account involved
Expand Down
4 changes: 4 additions & 0 deletions src/ATM.java → src/code/GUI/ATM.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package code.GUI;
// ATM.java
// Represents an automated teller machine

import code.Database.BankDatabase;
import code.Database.Transaction;

public class ATM
{
private boolean userAuthenticated; // whether user is authenticated
Expand Down
1 change: 1 addition & 0 deletions src/ATMCaseStudy.java → src/code/GUI/ATMCaseStudy.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package code.GUI;
// ATMCaseStudy.java
// Driver program for the ATM case study

Expand Down
9 changes: 7 additions & 2 deletions src/BalanceInquiry.java → src/code/GUI/BalanceInquiry.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package code.GUI;
import code.Buisness_logic.Euro;
// BalanceInquiry.java
// Represents a balance inquiry ATM transaction

import code.Database.BankDatabase;
import code.Database.Transaction;

public class BalanceInquiry extends Transaction
{
// BalanceInquiry constructor
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/CashDispenser.java → src/code/GUI/CashDispenser.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package code.GUI;

// CashDispenser.java
// Represents the cash dispenser of the ATM

Expand Down
24 changes: 18 additions & 6 deletions src/Deposit.java → src/code/GUI/Deposit.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package code.GUI;
import code.Buisness_logic.Euro;
// Deposit.java
// Represents a deposit ATM transaction

import code.Database.BankDatabase;
import code.Database.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
Expand All @@ -30,7 +35,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(
Expand Down Expand Up @@ -65,21 +70,28 @@ 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


// check whether the user canceled or entered a valid amount
if ( input == CANCELED )
return CANCELED;
if ( input == 0 )
return new Euro(0); //CANCELED
else
{
return ( double ) input / 100; // return dollar amount
return new Euro((long)Math.floor(input/100), input%100);
/* abbiamo fatto in modo che si possa costruire un oggetto
euro partendo da un long, abbiamo fatto il cast a long poichè
Math.floor resituisce un double ma siccome ci interessa la
parte intera non dovrebbe essere un problema */

} // end else
} // end method promptForDepositAmount
} // end class Deposit
Expand Down
1 change: 1 addition & 0 deletions src/DepositSlot.java → src/code/GUI/DepositSlot.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
package code.GUI;
// DepositSlot.java
// Represents the deposit slot of the ATM

Expand Down
1 change: 1 addition & 0 deletions src/Keypad.java → src/code/GUI/Keypad.java
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/Screen.java → src/code/GUI/Screen.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
package code.GUI;
import code.Buisness_logic.Euro;
// Screen.java
// Represents the screen of the ATM

Expand All @@ -16,9 +18,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

Expand Down
14 changes: 10 additions & 4 deletions src/Withdrawal.java → src/code/GUI/Withdrawal.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package code.GUI;
import code.Buisness_logic.Euro;
// Withdrawal.java
// Represents a withdrawal ATM transaction

import code.Database.BankDatabase;
import code.Database.Transaction;

public class Withdrawal extends Transaction
{
private int amount; // amount to withdraw
Expand All @@ -27,7 +32,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();
Expand All @@ -45,15 +50,16 @@ public void execute()
// get available balance of account involved
availableBalance =
bankDatabase.getAvailableBalance( getAccountNumber() );


Euro euroAmount = new Euro(amount);
// check whether the user has enough money in the account
if ( amount <= availableBalance )
if ( euroAmount.minoreDi(availableBalance) )
{
// check whether the cash dispenser has enough money
if ( cashDispenser.isSufficientCashAvailable( amount ) )
{
// update the account involved to reflect withdrawal
bankDatabase.debit( getAccountNumber(), amount );
bankDatabase.debit( getAccountNumber(), euroAmount );

cashDispenser.dispenseCash( amount ); // dispense cash
cashDispensed = true; // cash was dispensed
Expand Down