diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java index 22018d8400..96bda3a9a7 100644 --- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java +++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/MainDesignerController.java @@ -30,7 +30,6 @@ import net.sourceforge.pmd.util.fxdesigner.util.LimitedSizeStack; import net.sourceforge.pmd.util.fxdesigner.util.TextAwareNodeWrapper; import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil; import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil.PersistentProperty; -import net.sourceforge.pmd.util.fxdesigner.util.controls.NodeParentageBreadCrumbBar; import javafx.application.Platform; import javafx.fxml.FXML; @@ -93,8 +92,6 @@ public class MainDesignerController extends AbstractController { private Tab xpathEditorTab; @FXML private SplitPane mainHorizontalSplitPane; - @FXML - private NodeParentageBreadCrumbBar focusNodeParentageBreadCrumbBar; /* Children */ @@ -133,8 +130,6 @@ public class MainDesignerController extends AbstractController { setupAuxclasspathMenuItem.setOnAction(e -> sourceEditorController.showAuxclasspathSetupPopup(designerRoot)); - // the editor controller will initialize this after this controller - sourceEditorController.focusNodeParentageCrumbBar = focusNodeParentageBreadCrumbBar; } diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/SourceEditorController.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/SourceEditorController.java index a45b6b2f8b..697c07af59 100644 --- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/SourceEditorController.java +++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/SourceEditorController.java @@ -83,8 +83,8 @@ public class SourceEditorController extends AbstractController { private TreeView astTreeView; @FXML private HighlightLayerCodeArea codeEditorArea; - // actually a child of the main controller, set during parent initialization - NodeParentageBreadCrumbBar focusNodeParentageCrumbBar; + @FXML + private NodeParentageBreadCrumbBar focusNodeParentageBreadCrumbBar; private ASTManager astManager; private TreeViewWrapper treeViewWrapper; @@ -158,7 +158,7 @@ public class SourceEditorController extends AbstractController { DesignerUtil.rewire(astManager.languageVersionProperty(), languageVersionUIProperty); // Focus the crumb - focusNodeParentageCrumbBar.setOnRegularCrumbAction(treeitem -> { + focusNodeParentageBreadCrumbBar.setOnRegularCrumbAction(treeitem -> { if (treeitem != null && treeitem.getValue() != null) { focusNodeInTreeView(treeitem.getValue()); @@ -365,7 +365,7 @@ public class SourceEditorController extends AbstractController { } } - focusNodeParentageCrumbBar.setFocusNode(node); + focusNodeParentageBreadCrumbBar.setFocusNode(node); } diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml index 0c3ba82a88..0730bc552a 100644 --- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml +++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml @@ -2,25 +2,14 @@ - - - - - - - - - - - @@ -64,25 +53,7 @@
- -
- -
- - - - - - - - - - - - -
+
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml index 9d6cf727a4..b93051d25b 100644 --- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml +++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml @@ -1,79 +1,94 @@ - + + + + - - - - - - - - - - - + +
+ + + + + + + + + + + - - - - - - - - - - - - - - - - -
- -
- - - - - - -
-
-
-
-
+ + + + + + + + +