Use setRGB rather than color, fillrect

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

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index fcd952b..fa06d94 100755 (executable)
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -36,10 +36,7 @@ import java.awt.image.*;
 public class FeatureRenderer\r
 {\r
     AlignViewport av;\r
-    SequenceGroup currentSequenceGroup = null;\r
-    SequenceGroup[] allGroups = null;\r
     Color resBoxColour;\r
-    Graphics graphics;\r
     float transparency = 1.0f;\r
     FontMetrics fm;\r
     int charOffset;\r
@@ -47,7 +44,7 @@ public class FeatureRenderer
 \r
     // The following vector holds the features which are\r
     // to be added, in the correct order or rendering\r
-    Vector featuresDisplayed;\r
+    Vector featuresDisplayed = null;\r
 \r
     /**\r
      * Creates a new FeatureRenderer object.\r
@@ -65,17 +62,17 @@ public class FeatureRenderer
      * of the rendered sequence\r
      */\r
     BufferedImage bi;\r
-    public Color findFeatureColour(Color initialCol, SequenceI seq, int i)\r
+    public synchronized Color findFeatureColour(Color initialCol, SequenceI seq, int i)\r
     {\r
       if(!av.showSequenceFeatures)\r
         return initialCol;\r
 \r
-      if(bi==null)\r
-        bi = new BufferedImage(1,1,BufferedImage.TYPE_INT_RGB);\r
+      if (bi == null)\r
+        bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);\r
+\r
+      bi.setRGB(0,0, initialCol.getRGB());\r
 \r
       drawText = false;\r
-      bi.getGraphics().setColor(initialCol);\r
-      bi.getGraphics().fillRect(0, 0, 1, 1);\r
       drawSequence(bi.getGraphics(), seq, i, i, 0, 0, 1, 1);\r
       drawText = true;\r
 \r
@@ -100,6 +97,7 @@ public class FeatureRenderer
                              int start, int end, int x1, int y1, int width, int height)\r
     {\r
 \r
+//System.out.println(start+" "+end+" "+x1+" "+y1);\r
       if (seq.getDatasetSequence().getSequenceFeatures() == null\r
           || seq.getDatasetSequence().getSequenceFeatures().size()==0)\r
         return;\r
@@ -260,7 +258,7 @@ public class FeatureRenderer
       // The feature table will display high priority\r
       // features at the top, but theses are the ones\r
       // we need to render last, so invert the data\r
-      featuresDisplayed = new Vector();\r
+      featuresDisplayed.clear();\r
       for(int i=data.length-1; i>-1; i--)\r
       {\r
        String type = data[i][0].toString();\r