From 1d5e5aa70660d5a43aa80307f759040dd6d78cac Mon Sep 17 00:00:00 2001
From: Siddhant Dewani <siddhant.dewani@ucalgary.ca>
Date: Sun, 10 Mar 2019 21:11:49 -0600
Subject: [PATCH] Fixed bank and loanshark

---
 src/TaipanShopGUI.java |  4 ++--
 src/bankGUI.java       | 21 +++++++++++----------
 src/loanSharkGUI.java  | 12 ++++++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index fbf07a9..2822951 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -491,7 +491,7 @@ public class TaipanShopGUI {
         bankButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                bankGUI bank = new bankGUI();
+                bankGUI bank = new bankGUI(player);
                 bank.initializeBank(stage);
                 stage.show();
             }
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
         loanButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             public void handle(ActionEvent event) {
-                loanSharkGUI loan = new loanSharkGUI();
+                loanSharkGUI loan = new loanSharkGUI(player);
                 loan.initializeLoanShark(stage);
                 stage.show();
             }
diff --git a/src/bankGUI.java b/src/bankGUI.java
index 4818102..5c0ad4d 100644
--- a/src/bankGUI.java
+++ b/src/bankGUI.java
@@ -12,7 +12,7 @@ import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 public class bankGUI{
-    private Player player = new Player();
+    private Player player;
     /**
      * setter method that takes in a Player object as an argument.
      *
@@ -36,19 +36,19 @@ public class bankGUI{
      *
      //* @param player object of the class Player
      */
-    //public bankGUI(Player player){
-    //    Player playerDummy = new Player(player);
-    //    this.player = playerDummy;
-    //}
+    public bankGUI(Player player){
+        Player playerDummy = new Player(player);
+        this.player = playerDummy;
+    }
 
     public Stage initializeBank(Stage primaryStage) {
         primaryStage.setTitle("Bank");
 
         //Declaring each Layout
         BorderPane brdr1 = new BorderPane();
-        HBox hbx1 = new HBox(10);
-        HBox hbx2 = new HBox(10);
-        VBox vbx1 = new VBox(10);
+        HBox hbx1 = new HBox(30);
+        HBox hbx2 = new HBox(30);
+        VBox vbx1 = new VBox(30);
 
         //Declaring all Variables
         Label l1 = new Label("Player:  " + player.getName());
@@ -88,11 +88,11 @@ public class bankGUI{
         brdr1.setTop(vbx1);
 
         // Set the event handler when the deposit button is clicked
-        boolean keepGoing = true;
         b1.setOnAction(new EventHandler<ActionEvent>() {
                            @Override
                            public void handle(ActionEvent event) {
                                int withdraw = Integer.parseInt(txtField1.getText());
+                               System.out.println(withdraw);
                                if(withdraw <= player.getBank()){
                                    player.setMoney(withdraw + player.getMoney());
                                    player.setBank(player.getBank()-withdraw);
@@ -111,6 +111,7 @@ public class bankGUI{
                            @Override
                            public void handle(ActionEvent event) {
                                int deposit = Integer.parseInt(txtField1.getText());
+                               System.out.println(deposit);
                                if(deposit <= player.getMoney()){
                                    player.setBank(deposit + player.getBank());
                                    player.setMoney(player.getMoney()-deposit);
@@ -146,7 +147,7 @@ public class bankGUI{
 
 
     public void start(Stage primaryStage) {
-        bankGUI bank = new bankGUI();
+        bankGUI bank = new bankGUI(player);
         bank.initializeBank(primaryStage);
         primaryStage.show();
     }
diff --git a/src/loanSharkGUI.java b/src/loanSharkGUI.java
index c1dc880..4c335cd 100644
--- a/src/loanSharkGUI.java
+++ b/src/loanSharkGUI.java
@@ -12,7 +12,7 @@ import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 public class loanSharkGUI{
-        private Player player = new Player();
+        private Player player;
         /**
          * setter method that takes in a Player object as an argument.
          *
@@ -36,10 +36,10 @@ public class loanSharkGUI{
          *
          //* @param player object of the class Player
          */
-        //public loanSharkGUI(Player player){
-        //    Player playerDummy = new Player(player);
-        //    this.player = playerDummy;
-        //}
+        public loanSharkGUI(Player player){
+            Player playerDummy = new Player(player);
+            this.player = playerDummy;
+        }
 
     public Stage initializeLoanShark(Stage primaryStage) {
         primaryStage.setTitle("Loan Shark");
@@ -151,7 +151,7 @@ public class loanSharkGUI{
 
 
     public void start(Stage primaryStage) {
-        loanSharkGUI loan = new loanSharkGUI();
+        loanSharkGUI loan = new loanSharkGUI(player);
         loan.initializeLoanShark(primaryStage);
         primaryStage.show();
     }