From 59bf1e586a44b01ce6f708d9d950173b382e5e8b Mon Sep 17 00:00:00 2001 From: Peter Mucha Date: Wed, 4 Jul 2018 08:48:17 +0200 Subject: [PATCH] fixed name clash of 'promptLayer' --- .../controllers/AbstractSearchablePaneController.java | 6 +++--- src/main/resources/fxml/homewindow/SearchPane.fxml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rohitawate/everest/controllers/AbstractSearchablePaneController.java b/src/main/java/com/rohitawate/everest/controllers/AbstractSearchablePaneController.java index 0bafb53..b015970 100644 --- a/src/main/java/com/rohitawate/everest/controllers/AbstractSearchablePaneController.java +++ b/src/main/java/com/rohitawate/everest/controllers/AbstractSearchablePaneController.java @@ -24,7 +24,7 @@ import javafx.scene.layout.VBox; public abstract class AbstractSearchablePaneController implements Initializable { @FXML - private StackPane promptLayer, searchLayer, searchFailedLayer; + private StackPane searchPromptLayer, searchLayer, searchFailedLayer; @FXML private JFXButton clearSearchFieldButton; @@ -99,7 +99,7 @@ public abstract class AbstractSearchablePaneController implements Initializab try { List entries = entryLoader.get(); if (entries.size() == 0) { - promptLayer.setVisible(true); + searchPromptLayer.setVisible(true); return; } @@ -127,7 +127,7 @@ public abstract class AbstractSearchablePaneController implements Initializab } private Searchable appendToList(T state, VBox layer, boolean appendToStart) { - promptLayer.setVisible(false); + searchPromptLayer.setVisible(false); try { SearchEntry searchEntry = createEntryFromState(state); diff --git a/src/main/resources/fxml/homewindow/SearchPane.fxml b/src/main/resources/fxml/homewindow/SearchPane.fxml index c3c10f4..0589e01 100644 --- a/src/main/resources/fxml/homewindow/SearchPane.fxml +++ b/src/main/resources/fxml/homewindow/SearchPane.fxml @@ -77,7 +77,7 @@ - +