JAL-1713 JAL-3119 JAL-3785 refactored get/set Overview bounds and title

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index eed9846..b2dfbca 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -2854,19 +2854,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     }
     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;
   }
 
@@ -3401,10 +3388,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
       return alignPanel.overviewPanel;
     }
     JInternalFrame frame = new JInternalFrame();
-    final OverviewPanel overview = new OverviewPanel(alignPanel, showHidden);
+    final OverviewPanel overview = new OverviewPanel(alignPanel, frame, showHidden);
     frame.setContentPane(overview);
-    String overviewTitle = getOverviewTitle();
-    Desktop.addInternalFrame(frame, overviewTitle, true, frame.getWidth(), frame.getHeight(),
+    Desktop.addInternalFrame(frame, "", true, frame.getWidth(), frame.getHeight(),
             true, true);
     frame.pack();
     frame.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -3426,29 +3412,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     }
 
     alignPanel.setOverviewPanel(overview);
+    alignPanel.setOverviewTitle(this);
     
     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()
   {
@@ -4915,7 +4883,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   {
     if (index > -1)
     {
+      /*
+       * update current Overview window title (if there is one)
+       * to add view name "Original" if necessary
+       */
+      alignPanel.setOverviewTitle(this);
+      
+      /*
+       * switch panels and set Overview title (if there is one
+       * because it was opened automatically)
+       */
       alignPanel = alignPanels.get(index);
+      alignPanel.setOverviewTitle(this);
+
       viewport = alignPanel.av;
       avc.setViewportAndAlignmentPanel(viewport, alignPanel);
       setMenusFromViewport(viewport);