From 303be2eea6d18ea2b90c954703e92366441c2728 Mon Sep 17 00:00:00 2001
From: KahootChampion
Date: Mon, 11 Mar 2019 12:27:05 -0600
Subject: [PATCH] Fixed output for start and TaipanShop GUI
---
src/StartGUI.java | 2 +-
src/TaipanShopGUI.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/StartGUI.java b/src/StartGUI.java
index e411105..18c5caa 100644
--- a/src/StartGUI.java
+++ b/src/StartGUI.java
@@ -160,7 +160,7 @@ public class StartGUI {
*/
authors.setPrefHeight(80.0);
authors.setPrefWidth(499.0);
- authors.setText("By Vikram Bawa, Haris Muhammad, Siddhant Dewani, Nathan Lum and Harkamal Randhawa");
+ authors.setText("By Vikram Bawa, Haris Muhammad, Siddhant Dewani, Nathan Lum \nand Harkamal Randhawa");
/**
* Puts Vbox0 in the center of the borderpane.
diff --git a/src/TaipanShopGUI.java b/src/TaipanShopGUI.java
index 05a1173..00a5856 100644
--- a/src/TaipanShopGUI.java
+++ b/src/TaipanShopGUI.java
@@ -516,10 +516,10 @@ public class TaipanShopGUI {
});
bankButton.setMnemonicParsing(false);
bankButton.setPrefWidth(74.0);
- bankButton.setText("Visit Bank");
+ bankButton.setText("Bank");
cargoButton.setPrefHeight(25.0);
- cargoButton.setText("Transfer Cargo");
+ cargoButton.setText("Transfer");
cargoButton.setMnemonicParsing(false);
cargoButton.setPrefWidth(94.0);
// warehouse is entered when the warehouse button is clicked.
@@ -545,12 +545,12 @@ public class TaipanShopGUI {
stage.show();
}
});
- loanButton.setText("Get Loans");
+ loanButton.setText("Loans");
quitButton.setPrefHeight(25.0);
quitButton.setMnemonicParsing(false);
quitButton.setPrefWidth(90.0);
- quitButton.setText("Quit Trading");
+ quitButton.setText("Quit");
// the user is free to travel once the quit button is clicked.
quitButton.setOnAction(new EventHandler() {
@Override