JAL-3785 set full title on automatically opened Overview windows

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 6916a55..eed9846 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -2853,6 +2853,20 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       viewport.setGatherViewsHere(true);
     }
     tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1);
+
+    /*
+     * finally if new view has acquired an Overview window (because
+     * Preferences option to open Overview is selected), set its title
+     */
+    OverviewPanel ov = newap.overviewPanel;
+    if (ov != null)
+    {
+      String ttl = getOverviewTitle();
+      ((JInternalFrame) SwingUtilities
+              .getAncestorOfClass(JInternalFrame.class, ov))
+                      .setTitle(ttl);
+    }
+
     return newap;
   }
 
@@ -3389,14 +3403,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     JInternalFrame frame = new JInternalFrame();
     final OverviewPanel overview = new OverviewPanel(alignPanel, showHidden);
     frame.setContentPane(overview);
-    String overviewTitle = MessageManager
-            .formatMessage("label.overview_params", new Object[]
-            { this.getTitle() });
-    String viewName = alignPanel.getViewName();
-    if (viewName != null)
-    {
-      overviewTitle += (" " + viewName);
-    }
+    String overviewTitle = getOverviewTitle();
     Desktop.addInternalFrame(frame, overviewTitle, true, frame.getWidth(), frame.getHeight(),
             true, true);
     frame.pack();
@@ -3423,6 +3430,25 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     return overview;
   }
 
+  /**
+   * Constructs a title for the Overview window including the alignment window's
+   * title, and view name (if applicable)
+   * 
+   * @return
+   */
+  public String getOverviewTitle()
+  {
+    String overviewTitle = MessageManager
+            .formatMessage("label.overview_params", new Object[]
+            { this.getTitle() });
+    String viewName = alignPanel.getViewName();
+    if (viewName != null)
+    {
+      overviewTitle += (" " + viewName);
+    }
+    return overviewTitle;
+  }
+
   @Override
   public void textColour_actionPerformed()
   {