From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 15 Jun 2006 12:53:37 +0000 (+0000)
Subject: FeatureRenderer synchronized featuresAdded method
X-Git-Tag: Release_2_1~349
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d2f3c59deebfd9ea52b0021ab31467c18b9d2c14;p=jalview.git

FeatureRenderer synchronized featuresAdded method
---

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 4a7a05d..8e02a9c 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -250,8 +250,15 @@ public class AlignmentPanel extends GAlignmentPanel
 
   public void newFeatures(FeatureEvent evt)
   {
-    seqPanel.seqCanvas.fr.findAllFeatures();
-    repaint();
+    if (evt.getFeatures().length > 0)
+    {
+      seqPanel.seqCanvas.fr.featuresAdded();
+      repaint();
+    }
+    else
+    {
+      System.out.println("No Features found for "+evt.getDasSource().getNickname());
+    }
   }
 
   /**
diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 628de4e..b06cace 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -54,6 +54,8 @@ public class FeatureRenderer
 
     String [] renderOrder;
 
+    boolean newFeatureAdded = false;
+
 
     /**
      * Creates a new FeatureRenderer object.
@@ -175,7 +177,9 @@ public class FeatureRenderer
         fm = g.getFontMetrics();
 
 
-      if (av.featuresDisplayed == null || renderOrder==null)
+      if (av.featuresDisplayed == null
+          || renderOrder==null
+          || newFeatureAdded)
        {
          findAllFeatures();
          if(av.featuresDisplayed.size()<1)
@@ -212,6 +216,7 @@ public class FeatureRenderer
       for(int renderIndex=0; renderIndex<renderOrder.length; renderIndex++)
        {
         type =  renderOrder[renderIndex];
+
         if(!av.featuresDisplayed.containsKey(type))
           continue;
 
@@ -333,12 +338,24 @@ public class FeatureRenderer
       }
     }
 
-    synchronized void findAllFeatures()
+    int count = 0;
+    synchronized public void featuresAdded()
     {
+      newFeatureAdded = true;
+      findAllFeatures();
+      newFeatureAdded = false;
+    }
+
+   synchronized void findAllFeatures()
+   {
       jalview.schemes.UserColourScheme ucs = new
           jalview.schemes.UserColourScheme();
 
-          av.featuresDisplayed = new Hashtable();
+      if(av.featuresDisplayed==null)
+        av.featuresDisplayed = new Hashtable();
+
+      av.featuresDisplayed.clear();
+
       Vector allfeatures = new Vector();
       for (int i = 0; i < av.alignment.getHeight(); i++)
       {