From 386cd5fbbcddbefe76728ed6d1c9e5f83d36b044 Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Fri, 22 Apr 2011 14:24:52 +0000
Subject: [PATCH] removed useless flag (was always null for button press) to
 ensure default view colouring behaviour for JAL-824 when
 sequence colouring is chosen

---
 src/jalview/gui/AppJmol.java |   32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index 9d68c1b..d5148ba 100644
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -210,30 +210,7 @@ public class AppJmol extends GStructureViewer implements Runnable,
 
       }
     });
-    colourMenu.addMenuListener(new MenuListener()
-    {
-      
-      @Override
-      public void menuSelected(MenuEvent arg0)
-      {
-        
-        handlingGuiEvents=true;
-      }
-      
-      @Override
-      public void menuDeselected(MenuEvent arg0)
-      {
-        handlingGuiEvents=false;
-      }
-      
-      @Override
-      public void menuCanceled(MenuEvent arg0)
-      {
-        handlingGuiEvents=false;
-      }
-    });
   }
-
   IProgressIndicator progressBar = null;
 
   public AppJmol(PDBEntry pdbentry, SequenceI[] seq, String[] chains,
@@ -658,13 +635,6 @@ public class AppJmol extends GStructureViewer implements Runnable,
    */
   private boolean _started = false;
 
-  /**
-   * state flag indicating if the GUI is active when a particular button event
-   * takes place (e.g. when a stateChange occurs on a checkbox - this could be
-   * programmatic or due to the user doing something)
-   */
-  private boolean handlingGuiEvents=false;
-
   public void run()
   {
     _started = true;
@@ -958,7 +928,7 @@ public class AppJmol extends GStructureViewer implements Runnable,
     }
     if (jmb.isColourBySequence())
     {
-      if (!jmb.isLoadingFromArchive() && handlingGuiEvents)
+      if (!jmb.isLoadingFromArchive())
       {
         if (ap!=null) {
         	// Make the currently displayed alignment panel the associated view
-- 
1.7.10.2