Check if colos are null

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

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 7b0fa67..b8d35dc 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -345,8 +345,9 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
       gg = (Graphics2D) image.getGraphics();\r
       gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
                           RenderingHints.VALUE_ANTIALIAS_ON);\r
-      fm = gg.getFontMetrics();\r
+\r
       gg.setFont(av.getFont());\r
+      fm = gg.getFontMetrics();\r
 \r
     drawComponent( gg, av.startRes, av.endRes+1);\r
     g.drawImage( image, 0, 0, this);\r
@@ -431,7 +432,10 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 \r
       for(j=startRes; j<endRes; j++)\r
       {\r
-        validRes = row.annotations[j]==null?false:true;\r
+        if(row.annotations.length<=j || row.annotations[j]==null)\r
+        validRes = false;\r
+       else\r
+         validRes = true;\r
 \r
        x = (j-startRes)*av.charWidth;\r
 \r
@@ -454,9 +458,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 \r
        if(validRes && row.annotations[j].displayCharacter.length()>0)\r
        {\r
-         int charOffset = (av.charWidth -\r
-                            fm.charWidth(row.annotations[j].displayCharacter.\r
-                                         charAt(0))) / 2;\r
+         int charOffset = (av.charWidth - fm.charWidth(row.annotations[j].displayCharacter.charAt(0)))/2;\r
          g.setColor( row.annotations[j].colour);\r
           if(j==0)\r
           {\r