Merge pull request #2317 from ControlSystemStudio/CSSTUDIO-1718

Highlight tab on selection in save&restore tree view

Author: shroffk

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/SaveAndRestoreController.java

@@ -215,8 +215,10 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
                 toggleGoldenMenuItemText.set(Boolean.parseBoolean(item.getValue().getProperty("golden")) ? Messages.contextMenuRemoveGoldenTag : Messages.contextMenuTagAsGolden);
                 toggleGoldenImageViewProperty.set(Boolean.parseBoolean(item.getValue().getProperty("golden")) ? snapshotImageView : snapshotGoldenImageView);
             }
-            if (me.getClickCount() == 2) {
-                nodeDoubleClicked(browserSelectionModel.getSelectedItems().get(0).getValue());
+            // Check if a tab has already been opened for this node.
+            boolean highlighted = highlightTab(item.getValue().getUniqueId());
+            if (!highlighted && me.getClickCount() == 2) {
+                nodeDoubleClicked(item.getValue());
             }
         });
 
@@ -550,13 +552,6 @@ public void nodeDoubleClicked(){
      */
     private void nodeDoubleClicked(Node node) {
 
-        // Disallow opening a tab multiple times for the same save set.
-        for (Tab tab : tabPane.getTabs()) {
-            if (tab.getId() != null && tab.getId().equals(node.getUniqueId())) {
-                return;
-            }
-        }
-
         Tab tab;
 
         switch (node.getNodeType()) {
@@ -576,6 +571,16 @@ private void nodeDoubleClicked(Node node) {
         tabPane.getSelectionModel().select(tab);
     }
 
+    private boolean highlightTab(String id){
+        for (Tab tab : tabPane.getTabs()) {
+            if (tab.getId() != null && tab.getId().equals(id)) {
+                tabPane.getSelectionModel().select(tab);
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Creates a new save set in the selected tree node.
      */