From: kiramt <k.mourao@dundee.ac.uk>
Date: Wed, 1 Nov 2017 11:21:47 +0000 (+0000)
Subject: Merge branch 'develop' into imp/JAL-2775
X-Git-Tag: Release_2_10_3b1~50^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4687e1243f51bd09334792b8a7ce518a5aa07de7;hp=-c;p=jalview.git

Merge branch 'develop' into imp/JAL-2775
---

4687e1243f51bd09334792b8a7ce518a5aa07de7
diff --combined src/jalview/gui/OverviewPanel.java
index 4145fbf,9ddb751..43b4310
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@@ -40,8 -40,10 +40,10 @@@ import java.awt.event.MouseAdapter
  import java.awt.event.MouseEvent;
  import java.awt.event.MouseMotionAdapter;
  import java.beans.PropertyChangeEvent;
+ import java.beans.PropertyVetoException;
  
  import javax.swing.JCheckBoxMenuItem;
+ import javax.swing.JInternalFrame;
  import javax.swing.JPanel;
  import javax.swing.JPopupMenu;
  import javax.swing.SwingUtilities;
@@@ -327,22 -329,6 +329,22 @@@ public class OverviewPanel extends JPan
     * changed
     * 
     */
 +  private void setBoxPositionOnly()
 +  {
 +    if (od != null)
 +    {
 +      int oldX = od.getBoxX();
 +      int oldY = od.getBoxY();
 +      int oldWidth = od.getBoxWidth();
 +      int oldHeight = od.getBoxHeight();
 +      od.setBoxPosition(av.getAlignment().getHiddenSequences(),
 +              av.getAlignment().getHiddenColumns());
 +      repaint(oldX - 1, oldY - 1, oldWidth + 2, oldHeight + 2);
 +      repaint(od.getBoxX(), od.getBoxY(), od.getBoxWidth(),
 +              od.getBoxHeight());
 +    }
 +  }
 +
    private void setBoxPosition()
    {
      if (od != null)
@@@ -356,7 -342,7 +358,7 @@@
    @Override
    public void propertyChange(PropertyChangeEvent evt)
    {
 -    setBoxPosition();
 +    setBoxPositionOnly();
    }
  
    /**
@@@ -366,8 -352,22 +368,22 @@@
    {
      try
      {
-       av.getRanges().removePropertyChangeListener(this);
+       if (av != null)
+       {
+         av.getRanges().removePropertyChangeListener(this);
+       }
+ 
        oviewCanvas.dispose();
+ 
+       /*
+        * close the parent frame (which also removes it from the
+        * Desktop Windows menu)
+        */
+       ((JInternalFrame) SwingUtilities.getAncestorOfClass(
+               JInternalFrame.class, (this))).setClosed(true);
+     } catch (PropertyVetoException e)
+     {
+       // ignore
      } finally
      {
        progressPanel = null;