X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplitFrame.java;h=574cf045acc42e3432739bd24c72b2be0acbb62e;hb=2a6bee646361a41a57c7a3868a966635c3d25a27;hp=8e5c2de239abdbea088d8de3f168b1ff57a90aae;hpb=24dbffc7cf9323f550875f5c6fe7df025aebbaf1;p=jalview.git

diff --git a/src/jalview/gui/SplitFrame.java b/src/jalview/gui/SplitFrame.java
index 8e5c2de..574cf04 100644
--- a/src/jalview/gui/SplitFrame.java
+++ b/src/jalview/gui/SplitFrame.java
@@ -37,8 +37,6 @@ import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -58,6 +56,8 @@ import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.KeyStroke;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.InternalFrameAdapter;
 import javax.swing.event.InternalFrameEvent;
 
@@ -180,26 +180,21 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
    */
   public void adjustLayout()
   {
+    final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport;
+    final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport;
+
     /*
      * Ensure sequence ids are the same width so sequences line up
      */
-    int w1 = ((AlignFrame) getTopFrame()).getViewport().getIdWidth();
-    int w2 = ((AlignFrame) getBottomFrame()).getViewport().getIdWidth();
+    int w1 = topViewport.getIdWidth();
+    int w2 = bottomViewport.getIdWidth();
     int w3 = Math.max(w1, w2);
-    if (w1 != w3)
-    {
-      ((AlignFrame) getTopFrame()).getViewport().setIdWidth(w3);
-    }
-    if (w2 != w3)
-    {
-      ((AlignFrame) getBottomFrame()).getViewport().setIdWidth(w3);
-    }
+    topViewport.setIdWidth(w3);
+    bottomViewport.setIdWidth(w3);
 
     /*
      * Scale protein to either 1 or 3 times character width of dna
      */
-    final AlignViewport topViewport = ((AlignFrame) getTopFrame()).viewport;
-    final AlignViewport bottomViewport = ((AlignFrame) getBottomFrame()).viewport;
     final AlignmentI topAlignment = topViewport.getAlignment();
     final AlignmentI bottomAlignment = bottomViewport.getAlignment();
     AlignmentViewport cdna = topAlignment.isNucleotide() ? topViewport
@@ -867,6 +862,30 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
     {
       showInternalFrame = true;
       featureSettingsPanels = new JTabbedPane();
+      featureSettingsPanels.addChangeListener(new ChangeListener()
+      {
+
+        @Override
+        public void stateChanged(ChangeEvent e)
+        {
+          if (e.getSource() != featureSettingsPanels
+                  || featureSettingsUI == null
+                  || featureSettingsUI.isClosed()
+                  || !featureSettingsUI.isVisible())
+          {
+            // not our tabbed pane
+            return;
+          }
+          int tab = featureSettingsPanels.getSelectedIndex();
+          if (tab < 0 || featureSettingsPanels
+                  .getSelectedComponent() instanceof FeatureSettingsControllerGuiI)
+          {
+            // no tab selected or already showing a feature settings GUI
+            return;
+          }
+          getAlignFrames().get(tab).showFeatureSettingsUI();
+        }
+      });
       featureSettingsUI = new JInternalFrame(MessageManager.getString(
               "label.sequence_feature_settings_for_CDS_and_Protein"));
       featureSettingsPanels.setOpaque(true);
@@ -998,33 +1017,13 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
                     }
                   }
                   featureSettingsPanels = null;
+                  featureSettingsUI = null;
                 };
               });
       featureSettingsUI.setLayer(JLayeredPane.PALETTE_LAYER);
     }
   }
 
-  /*
-   * for materialising feature settings for a tab when clicked on
-   */
-  private FocusListener fl1 = new FocusListener()
-  {
-
-    @Override
-    public void focusLost(FocusEvent e)
-    {
-      // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void focusGained(FocusEvent e)
-    {
-      int tab = featureSettingsPanels.getSelectedIndex();
-      getAlignFrames().get(tab).showFeatureSettingsUI();
-    }
-  };
-
   /**
    * tab names for feature settings
    */
@@ -1041,7 +1040,6 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
     for (int tabIndex = 0; tabIndex < 2; tabIndex++)
     {
       JPanel dummyTab = new JPanel();
-      dummyTab.addFocusListener(fl1);
       featureSettingsPanels.addTab(tabName[tabIndex], dummyTab);
     }
   }
@@ -1052,26 +1050,25 @@ public class SplitFrame extends GSplitFrame implements SplitContainerI
     for (int tabIndex = 0; tabIndex < 2; tabIndex++)
     {
       if (featureSettingsPanels.getTabCount() > tabIndex)
-    {
+      {
         dummyTab = featureSettingsPanels.getTabComponentAt(tabIndex);
         if (dummyTab instanceof FeatureSettingsControllerGuiI
                 && !dummyTab.isVisible())
-      {
+        {
           featureSettingsPanels.removeTabAt(tabIndex);
           // close the feature Settings tab
           ((FeatureSettingsControllerGuiI) dummyTab)
                   .featureSettings_isClosed();
           // create a dummy tab in its place
-        dummyTab = new JPanel();
-        dummyTab.addFocusListener(fl1);
+          dummyTab = new JPanel();
           featureSettingsPanels.insertTab(tabName[tabIndex], null, dummyTab,
                   MessageManager.formatMessage(
                           "label.sequence_feature_settings_for",
                           tabName[tabIndex]),
                   tabIndex);
+        }
       }
     }
-    }
   }
 
   @Override