header updated

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

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 44bd151..afe29a0 100755 (executable)
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -54,9 +54,6 @@ public class FeatureRenderer
 \r
     String [] renderOrder;\r
 \r
-    boolean newFeatureAdded = false;\r
-\r
-\r
     /**\r
      * Creates a new FeatureRenderer object.\r
      *\r
@@ -333,15 +330,26 @@ public class FeatureRenderer
       }\r
     }\r
 \r
-    synchronized public void featuresAdded()\r
+\r
+    boolean newFeatureAdded = false;\r
+\r
+    public void featuresAdded()\r
     {\r
-      newFeatureAdded = true;\r
       findAllFeatures();\r
-      newFeatureAdded = false;\r
     }\r
 \r
+   boolean findingFeatures = false;\r
    synchronized void findAllFeatures()\r
    {\r
+      newFeatureAdded = false;\r
+\r
+      if(findingFeatures)\r
+      {\r
+        newFeatureAdded = true;\r
+        return;\r
+      }\r
+\r
+      findingFeatures = true;\r
       jalview.schemes.UserColourScheme ucs = new\r
           jalview.schemes.UserColourScheme();\r
 \r
@@ -394,6 +402,8 @@ public class FeatureRenderer
         renderOrder[i] = en.nextElement().toString();\r
         i--;\r
       }\r
+\r
+      findingFeatures = false;\r
     }\r
 \r
     public Color getColour(String featureType)\r