Laboratorio 3 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

NicoloAkaCat wants to merge 13 commits into riccaF:main from NicoloAkaCat:main

.gitignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		bin/

bin/ATM.class

Binary file not shown.

bin/ATMCaseStudy.class

Binary file not shown.

bin/Account.class

Binary file not shown.

bin/BalanceInquiry.class

Binary file not shown.

bin/BankDatabase.class

Binary file not shown.

bin/CashDispenser.class

Binary file not shown.

bin/Deposit.class

Binary file not shown.

bin/DepositSlot.class

Binary file not shown.

bin/Keypad.class

Binary file not shown.

bin/Screen.class

Binary file not shown.

bin/Transaction.class

Binary file not shown.

bin/Withdrawal.class

Binary file not shown.

componenti.txt

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Andrea Chicco S5128817
		Nicolò Catania S5209932

lib/hamcrest-core-1.3.jar

Binary file not shown.

lib/junit-4.13.2.jar

Binary file not shown.

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

-Original file line number
+Diff line change
@@ -1,6 +1,9 @@
+    package code.Business_logic;
     // ATMCaseStudy.java
     // Driver program for the ATM case study
+    import code.GUI.ATM;
     public class ATMCaseStudy
     {
        // main method creates and runs the ATM
@@ Expand Down @@

src/BalanceInquiry.java → src/code/Business_logic/BalanceInquiry.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,14 @@
  
    package code.Business_logic;

    import code.Database.BankDatabase;

    import code.GUI.DepositSlot;

    // Deposit.java

    // Represents a deposit ATM transaction

    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 +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( 

    @@ -65,7 +70,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

    @@ -75,12 +80,7 @@ private double promptForDepositAmount()
  
          int input = keypad.getInput(); // receive input of deposit amount

          // check whether the user canceled or entered a valid amount

          if ( input == CANCELED ) 

             return CANCELED;

          else

          {

             return ( double ) input / 100; // return dollar amount 

          } // end else

          return new Euro(input == CANCELED ? CANCELED : (double) input / 100);

       } // end method promptForDepositAmount

    } // end class Deposit

src/code/Business_logic/Euro.java

-Original file line number
+Diff line change
@@ -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";
+        }
+    }

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

-Original file line number
+Diff line change
@@ -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
@@ Expand Down @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,12 @@
  
    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

    @@ -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(); 

    @@ -47,13 +53,13 @@ public void execute()
  
                   bankDatabase.getAvailableBalance( getAccountNumber() );

                // check whether the user has enough money in the account 

                if ( amount <= availableBalance )

                if ( amount <= availableBalance.getValore() )

                {   

                   // 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(), new Euro(amount) );

                      cashDispenser.dispenseCash( amount ); // dispense cash

                      cashDispensed = true; // cash was dispensed

    @@ -99,11 +105,11 @@ private int displayMenuOfAmounts()
  
          {

             // display the menu

             screen.displayMessageLine( "\nWithdrawal Menu:" );

             screen.displayMessageLine( "1 - $20" );

             screen.displayMessageLine( "2 - $40" );

             screen.displayMessageLine( "3 - $60" );

             screen.displayMessageLine( "4 - $100" );

             screen.displayMessageLine( "5 - $200" );

             screen.displayMessageLine( "1 - €20" );

             screen.displayMessageLine( "2 - €40" );

             screen.displayMessageLine( "3 - €60" );

             screen.displayMessageLine( "4 - €100" );

             screen.displayMessageLine( "5 - €200" );

             screen.displayMessageLine( "6 - Cancel transaction" );

             screen.displayMessage( "\nChoose a withdrawal amount: " );

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,16 +1,19 @@
  
    package code.Database;

    // Account.java

    // Represents a bank account

    import code.Business_logic.Euro;

    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;

    @@ -21,35 +24,32 @@ public Account( int theAccountNumber, int thePIN,
  
       // determines whether a user-specified PIN matches PIN in Account

       public boolean validatePIN( int userPIN )

       {

          if ( userPIN == pin )

             return true;

          else

             return false;

          return userPIN == pin;

       } // 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

          this.totalBalance = this.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

          this.availableBalance = this.availableBalance.sottrai(amount); // subtract from available balance

          this.totalBalance = this.totalBalance.sottrai(amount); // subtract from total balance

       } // end method debit

       // returns account number

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,9 @@
  
    package code.Database;

    // BankDatabase.java

    // Represents the bank account information database 

    import code.Business_logic.Euro;

    public class BankDatabase

    {

       private Account accounts[]; // array of Accounts

    @@ -9,8 +12,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,25 +45,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

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

-Original file line number
+Diff line change
@@ -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
@@ Expand Down @@

src/CashDispenser.java → src/code/GUI/CashDispenser.java

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    package code.GUI;
     // CashDispenser.java
     // Represents the cash dispenser of the ATM
@@ Expand Down Expand Up / @@ -25,10 +26,7 @@ public boolean isSufficientCashAvailable( int amount ) @@
        {
           int billsRequired = amount / 20; // number of $20 bills required
-          if ( count >= billsRequired  )
-             return true; // enough bills available
-          else
-             return false; // not enough bills available
+          return count >= billsRequired;
        } // end method isSufficientCashAvailable
     } // end class CashDispenser
@@ Expand Down @@

src/DepositSlot.java → src/code/GUI/DepositSlot.java

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    package code.GUI;
     // DepositSlot.java
     // Represents the deposit slot of the ATM
@@ Expand Down @@

src/Keypad.java → src/code/GUI/Keypad.java

-Original file 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 @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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.println(amount.stampa());   

       } // end method displayDollarAmount 

    } // end class Screen

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Laboratorio 3 #5

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Laboratorio 3 #5

Are you sure you want to change the base?

Uh oh!

Laboratorio 3 #5

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!