RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Merged together Taipanshop with both Loanshark and Bank GUI

Browse Source
This commit is contained in:
Solargale
2019-03-10 18:36:54 -06:00
parent c3f7cc16d2
commit 0f2e8848ad
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TaipanShopGUI.java
View File

@@ -492,7 +492,9 @@ public class TaipanShopGUI {
bankButton.setOnAction(new EventHandler<ActionEvent>() { bankButton.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
System.out.println("PLACEHOLDER FOR BANK"); bankGUI bank = new bankGUI();
bank.initializeBank(stage);
stage.show();
} }
}); });
bankButton.setMnemonicParsing(false); bankButton.setMnemonicParsing(false);
@@ -519,7 +521,9 @@ public class TaipanShopGUI {
loanButton.setOnAction(new EventHandler<ActionEvent>() { loanButton.setOnAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent event) { public void handle(ActionEvent event) {
System.out.println("PLACEHOLDER FOR LOAN SHARK"); loanSharkGUI loan = new loanSharkGUI();
loan.initializeLoanShark(stage);
stage.show();
} }
}); });
loanButton.setText("Get Loans"); loanButton.setText("Get Loans");

2
src/WarehouseGUI.java
View File

@@ -12,7 +12,7 @@ import javafx.scene.text.Font;
import javafx.scene.text.Text; import javafx.scene.text.Text;
import javafx.stage.Stage; import javafx.stage.Stage;
public class WarehouseGUI extends Application { public class WarehouseGUI {
private Player player; private Player player;

7
src/bankGUI.java
View File

@@ -11,7 +11,7 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.Stage; import javafx.stage.Stage;
public class bankGUI extends Application { public class bankGUI{
private Player player = new Player(); private Player player = new Player();
/** /**
* setter method that takes in a Player object as an argument. * setter method that takes in a Player object as an argument.
@@ -148,9 +148,4 @@ public class bankGUI extends Application {
bank.initializeBank(primaryStage); bank.initializeBank(primaryStage);
primaryStage.show(); primaryStage.show();
} }
public static void main(String args[]) {
launch(args);
}
} }

6
src/loanSharkGUI.java
View File

@@ -11,7 +11,7 @@ import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.stage.Stage; import javafx.stage.Stage;
public class loanSharkGUI extends Application{ public class loanSharkGUI{
private Player player = new Player(); private Player player = new Player();
/** /**
* setter method that takes in a Player object as an argument. * setter method that takes in a Player object as an argument.
@@ -153,10 +153,6 @@ public class loanSharkGUI extends Application{
loan.initializeLoanShark(primaryStage); loan.initializeLoanShark(primaryStage);
primaryStage.show(); primaryStage.show();
} }
public static void main(String args[]) {
launch(args);
}
/** /**