From 24caafeb32f8531894aeead29c1932a57348c1d9 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 21 Nov 2006 15:27:20 +0000
Subject: [PATCH] expanded views, j2xml use setinitialtabvisible, close all
 frames from jar file

---
 src/jalview/gui/AlignFrame.java  |   36 +++++++++++++++++++++++++++++-------
 src/jalview/gui/Jalview2XML.java |   10 +++++++---
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 8fafb34..6b8eb09 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -376,10 +376,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if (aSize == 2)
       {
-        AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
-        tabbedPane.addTab(first.av.viewName==null?"Original":first.av.viewName,first);
-
-        this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+        setInitialTabVisible();
       }
 
       expandViews.setEnabled(true);
@@ -398,6 +395,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
   }
 
+  public void setInitialTabVisible()
+  {
+    expandViews.setEnabled(true);
+    gatherViews.setEnabled(true);
+    tabbedPane.setVisible(true);
+    AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
+    tabbedPane.addTab(first.av.viewName==null?"Original":first.av.viewName,first);
+    this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+  }
+
 
   public AlignViewport getViewport()
   {
@@ -463,7 +470,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     abovePIDThreshold.setSelected(av.getAbovePIDThreshold());
     conservationMenuItem.setSelected(av.getConservationSelected());
     seqLimits.setSelected(av.getShowJVSuffix());
-    idRightAlign.setSelected(av.idsAlignRight);
+    idRightAlign.setSelected(av.rightAlignIds);
     renderGapsMenuItem.setSelected(av.renderGaps);
     wrapMenuItem.setSelected(av.wrapAlignment);
     annotationPanelMenuItem.setState(av.showAnnotation);
@@ -552,7 +559,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if(currentFileFormat.equals("Jalview"))
       {
-        this.closeMenuItem_actionPerformed(true);
+        JInternalFrame [] frames = Desktop.desktop.getAllFrames();
+        for(int i=0; i<frames.length; i++)
+        {
+          if (frames[i] instanceof AlignFrame
+              && frames[i] != this
+              && ( (AlignFrame) frames[i]).fileName.equals(fileName))
+          {
+            try{
+              frames[i].setSelected(true);
+              Desktop.instance.closeAssociatedWindows();
+            }catch(java.beans.PropertyVetoException ex){}
+          }
+
+        }
+        Desktop.instance.closeAssociatedWindows();
+
       }
       else
       {
@@ -1761,7 +1783,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   public void idRightAlign_actionPerformed(ActionEvent e)
   {
-    viewport.idsAlignRight = idRightAlign.isSelected();
+    viewport.rightAlignIds = idRightAlign.isSelected();
     alignPanel.repaint();
   }
 
diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 6e3bffe..e6191de 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -669,7 +669,7 @@ public class Jalview2XML
         view.setShowBoxes(av.getShowBoxes());
         view.setShowColourText(av.getColourText());
         view.setShowFullId(av.getShowJVSuffix());
-        view.setRightAlignIds(av.idsAlignRight);
+        view.setRightAlignIds(av.rightAlignIds);
         view.setShowSequenceFeatures(av.showSequenceFeatures);
         view.setShowText(av.getShowText());
         view.setWrapAlignment(av.getWrapAlignment());
@@ -1403,7 +1403,11 @@ public class Jalview2XML
           af.alignPanel.adjustAnnotationHeight();
         }
 
-        af.viewport.viewName = view.getViewName();
+        if(view.getViewName()!=null)
+        {
+          af.viewport.viewName = view.getViewName();
+          af.setInitialTabVisible();
+        }
         af.setBounds(view.getXpos(), view.getYpos(), view.getWidth(),
             view.getHeight());
         af.viewport.setStartRes(view.getStartRes());
@@ -1415,7 +1419,7 @@ public class Jalview2XML
 
         af.viewport.setConservationSelected(view.getConservationSelected());
         af.viewport.setShowJVSuffix(view.getShowFullId());
-        af.viewport.idsAlignRight=view.getRightAlignIds();
+        af.viewport.rightAlignIds=view.getRightAlignIds();
         af.viewport.setFont(new java.awt.Font(view.getFontName(),
                 view.getFontStyle(), view.getFontSize()));
         af.alignPanel.fontChanged();
-- 
1.7.10.2