X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSeqPanel.java;h=daff328cc57240ad7e34403a2af103c31f561c70;hb=4944c2f33bb34b4f262fd2f3ae40dcdc2a825557;hp=2f06d64b83a33d1e7b4f5b4441c526e2a68035dc;hpb=de468b0bf50850a89c6a8a7acfa4ff5b689ffed1;p=jalview.git

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 2f06d64..daff328 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -257,29 +257,41 @@ public class SeqPanel
     // use aa to see if the mouse pointer is on a
     if (av.showSequenceFeatures && sequence.getSequenceFeatures()!=null)
     {
-      Vector features = sequence.getSequenceFeatures();
-      Enumeration e = features.elements();
+      int index = 0;
+      sequence.getSequenceFeatures();
       boolean first = true;
-      while (e.hasMoreElements())
+      while (index < sequence.getSequenceFeatures().length)
       {
-        SequenceFeature sf = (SequenceFeature) e.nextElement();
+        SequenceFeature sf = sequence.getSequenceFeatures()[index];
         if (sf.getBegin() <= sequence.findPosition(res) &&
             sf.getEnd() >= sequence.findPosition(res))
         {
+          if(!av.featuresDisplayed.containsKey(sf.getType()))
+           {
+             index++;
+             continue;
+           }
+
           if(first)
           {
-            text.append(" Sequence Feature: ");
+            text.append(" Sequence Feature:");
             first = false;
           }
 
-          text.append(sf.getDescription());
-          if (sf.getStatus().length() > 0)
+          text.append(" "+sf.getType());
+
+          if(sf.getDescription()!=null)
+            text.append(" "+sf.getDescription());
+
+          if (sf.getStatus()!=null && sf.getStatus().length() > 0)
           {
             text.append(" (" + sf.getStatus() + ")");
           }
           text.append("; ");
         }
 
+        index++;
+
       }
     }
 
@@ -433,8 +445,7 @@ public class SeqPanel
 
   public void drawChars(int seqstart, int seqend, int start)
   {
-    seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart, seqend,
-                        av.getStartRes(), av.getStartSeq(), 0);
+    seqCanvas.drawPanel(seqCanvas.gg, start, av.getEndRes(), seqstart, seqend,  0);
     seqCanvas.repaint();
   }