X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=24bf616708a6981d05b47310e7893fa8057ce659;hb=b3b59df08fc4183bb35e4ed5a54841a990b71346;hp=84f18ba2840a05cf38268695a42916339dc2b884;hpb=da144cfa9b7997a6e8dd04ef10d55bcea3b02c71;p=jalview.git

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 84f18ba..24bf616 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -280,9 +280,12 @@ public class IdCanvas extends JPanel
         {
           //Now draw the id strings
 
+            SequenceI sequence;
             //Now draw the id strings
             for (int i = starty; i < endy; i++)
             {
+              sequence = av.alignment.getSequenceAt(i);
+
               if (av.hasHiddenRows)
               {
                 setHiddenFont(i);
@@ -290,21 +293,21 @@ public class IdCanvas extends JPanel
 
                 // Selected sequence colours
                 if ( (searchResults != null) &&
-                    searchResults.contains(av.alignment.getSequenceAt(i)))
+                    searchResults.contains(sequence))
                 {
                   currentColor = Color.black;
                   currentTextColor = Color.white;
                 }
                 else if ( (av.getSelectionGroup() != null) &&
                          av.getSelectionGroup().getSequences(false).contains(
-                             av.alignment.getSequenceAt(i)))
+                             sequence))
                 {
                   currentColor = Color.lightGray;
                   currentTextColor = Color.black;
                 }
                 else
                 {
-                  currentColor = av.alignment.getSequenceAt(i).getColor();
+                  currentColor = sequence.getColor();
                   currentTextColor = Color.black;
                 }
 
@@ -315,7 +318,7 @@ public class IdCanvas extends JPanel
 
                 gg.setColor(currentTextColor);
 
-                String string = av.alignment.getSequenceAt(i).getDisplayId( av.getShowJVSuffix());
+                String string = sequence.getDisplayId( av.getShowJVSuffix());
 
                 gg.drawString(string, 0,
                     (((i - starty) * av.charHeight) + av.charHeight) -
@@ -395,7 +398,9 @@ public class IdCanvas extends JPanel
       Font bold = new Font(av.getFont().getName(), Font.BOLD,
                            av.getFont().getSize());
 
-      if (av.alignment.getSequenceAt(i).getHiddenSequences() != null)
+
+      if (av.alignment.getSequenceAt(i)!=null
+          && av.alignment.getSequenceAt(i).getHiddenSequences() != null)
         gg.setFont(bold);
       else
         gg.setFont(italic);