CSSTUDIO-2007 Add version of getDockItemWithInput() that returns any …

…DockItemWithInput whose input is the specified input. Improve check by not requiring that the application be the same.
ControlSystemStudio · Aug 11, 2023 · 2b5a13b · 2b5a13b
1 parent ed2f318
commit 2b5a13b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/DockItemWithInput.java b/core/ui/src/main/java/org/phoebus/ui/docking/DockItemWithInput.java
@@ -424,7 +424,7 @@ else if (response == ButtonType.NO)
             }
 
             URI newInput = ResourceParser.getURI(actual_file.get());
-            DockItemWithInput existingInstanceWithInput = DockStage.getDockItemWithInput(getApplication().getAppDescriptor().getName(), newInput);
+            DockItemWithInput existingInstanceWithInput = DockStage.getDockItemWithInput(newInput);
             if (existingInstanceWithInput == null || (input != null && newInput.getPath().equals(input.getPath()))) {
                 // Update input
                 setInput(newInput);
@@ -440,7 +440,7 @@ else if (response == ButtonType.NO)
                     dialog.setTitle(Messages.SaveAsFileAlreadyOpen_title);
                     String headerText = MessageFormat.format(Messages.SaveAsFileAlreadyOpen_header, filename);
                     dialog.setHeaderText(headerText);
-                    String contentText = MessageFormat.format(Messages.SaveAsFileAlreadyOpen_content, getApplication().getAppDescriptor().getDisplayName(), filename);
+                    String contentText = MessageFormat.format(Messages.SaveAsFileAlreadyOpen_content, existingInstanceWithInput.getApplication().getAppDescriptor().getDisplayName(), filename);
                     dialog.setContentText(contentText);
                     int width = 550;
                     int height = 200;

diff --git a/core/ui/src/main/java/org/phoebus/ui/docking/DockStage.java b/core/ui/src/main/java/org/phoebus/ui/docking/DockStage.java
@@ -366,6 +366,25 @@ public static DockItemWithInput getDockItemWithInput(final String application_na
         return null;
     }
 
+    /** Locate DockItemWithInput with input
+     *  @param input Input, must not be <code>null</code>
+     *  @return {@link DockItemWithInput} or <code>null</code> if not found
+     */
+    public static DockItemWithInput getDockItemWithInput(URI input)
+    {
+        Objects.requireNonNull(input);
+        for (Stage stage : getDockStages())
+            for (DockPane pane : getDockPanes(stage))
+                for (DockItem tab : pane.getDockItems())
+                    if (tab instanceof DockItemWithInput)
+                    {
+                        DockItemWithInput item = (DockItemWithInput) tab;
+                        if (input.equals(item.getInput()))
+                            return item;
+                    }
+        return null;
+    }
+
     /** Locate any 'fixed' {@link DockPane}s and un-fix them
      *  @param stage Stage where to clear 'fixed' panes
      */