From a1f02b7cfbf05f6f6e2e12581e2a944a94848775 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Sat, 1 Oct 2016 18:14:44 +1300 Subject: [PATCH] Initialised the LIstener in the Initilisation method instead of an onclick function --- res/userdb.db | Bin 8387584 -> 8387584 bytes .../seng202/group9/GUI/HelpController.java | 8 +------- src/main/resources/help.fxml | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/res/userdb.db b/res/userdb.db index 7f6767163311a8c5c207a49539ad35578427a26c..bd436605e3d1eade92cf6c575ebfb3aae3ccdaec 100644 GIT binary patch delta 5253 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 delta 5379 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 MNoxA54Q$`P0AvKu(f|Me diff --git a/src/main/java/seng202/group9/GUI/HelpController.java b/src/main/java/seng202/group9/GUI/HelpController.java index ee6dd23..d713253 100644 --- a/src/main/java/seng202/group9/GUI/HelpController.java +++ b/src/main/java/seng202/group9/GUI/HelpController.java @@ -69,12 +69,7 @@ public class HelpController extends Controller { text = new Text("Please select an option on the left side menu to display its contents."); textArea.getChildren().add(text); - } - /** - * Changes the text in the TextFlow depending on which option has been selected in the TreeView. - */ - public void changeView() { treeView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { public void changed(ObservableValue observable, Object oldValue, @@ -83,7 +78,7 @@ public class HelpController extends Controller { String menuValue = selectedItem.getValue(); if ( menuValue != null ){ - textArea.getChildren().clear(); + textArea.getChildren().clear(); if (menuValue.equals("Importing on Startup")) { text = new Text("Importing on Startup\n" + "You can import data from the first start up of the application." + "\nTo import data, select the type of data you wish to import along the bottom of the screen." + @@ -170,5 +165,4 @@ public class HelpController extends Controller { } }); } - } \ No newline at end of file diff --git a/src/main/resources/help.fxml b/src/main/resources/help.fxml index ff98d86..35d386b 100644 --- a/src/main/resources/help.fxml +++ b/src/main/resources/help.fxml @@ -34,7 +34,7 @@ - +