From af7207e24258b70337a51651da50ae6bc1a7473c Mon Sep 17 00:00:00 2001 From: Abraham Wolk Date: Thu, 10 Oct 2024 13:58:14 +0200 Subject: [PATCH] CSSTUDIO-2731 In comments, clarify that the Navigator application is ESS-specific. --- .../ui/src/main/java/org/phoebus/ui/docking/DockPane.java | 2 +- .../src/main/java/org/phoebus/ui/docking/SplitDock.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/DockPane.java b/core/ui/src/main/java/org/phoebus/ui/docking/DockPane.java index 15630a5ce..3b6ba358c 100644 --- a/core/ui/src/main/java/org/phoebus/ui/docking/DockPane.java +++ b/core/ui/src/main/java/org/phoebus/ui/docking/DockPane.java @@ -300,7 +300,7 @@ public void setDockParent(final Parent dock_parent) if (dock_parent == null || dock_parent instanceof BorderPane || dock_parent instanceof SplitDock || - dock_parent instanceof SplitPane) // "dock_parent instanceof SplitPane" is for the case of the Navigator application running + dock_parent instanceof SplitPane) // "dock_parent instanceof SplitPane" is for the case of the ESS-specific Navigator application running this.dock_parent = dock_parent; else throw new IllegalArgumentException("Expected BorderPane or SplitDock or SplitPane, got " + dock_parent); diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/SplitDock.java b/core/ui/src/main/java/org/phoebus/ui/docking/SplitDock.java index 35e990fac..f8482cd41 100644 --- a/core/ui/src/main/java/org/phoebus/ui/docking/SplitDock.java +++ b/core/ui/src/main/java/org/phoebus/ui/docking/SplitDock.java @@ -170,11 +170,11 @@ else if (dock_parent instanceof SplitDock) final boolean was_first = parent.removeItem(this); parent.addItem(was_first, child); } - else if (dock_parent instanceof SplitPane) { + else if (dock_parent instanceof SplitPane) { // "dock_parent instanceof SplitPane" is for the case of the ESS-specific Navigator application running final SplitPane parent = (SplitPane) dock_parent; - // parent.getItems().get(1) == this, parent.getItems().get(0) == Navigator application, - // when Navigator is being displayed. - // parent.getItems().get(0) == this when Navigator is not being displayed. + // parent.getItems().get(1) == this, parent.getItems().get(0) == (ESS-specific) Navigator application, + // when the (ESS-specific) Navigator is being displayed. + // parent.getItems().get(0) == this when (ESS-specific) Navigator is not being displayed. // No need to remove 'this' from parent, just update parent.getItems().get(last index) to child parent.getItems().set(parent.getItems().size()-1, child); }