From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 26 May 2005 09:54:29 +0000 (+0000)
Subject: check for null residues
X-Git-Tag: Release_2_0~174
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e71f130bc4fc45075dac74e1a6c1cd71bec33ee9;p=jalview.git

check for null residues
---

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 6a1e58b..2cf5beb 100755
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -253,7 +253,10 @@ public class AnnotationPanel extends Panel implements AdjustmentListener
 
       for(j=startRes; j<endRes; j++)
       {
-        validRes = row.annotations[j]==null?false:true;
+        if(row.annotations.length<=j || row.annotations[j]==null)
+        validRes = false;
+       else
+         validRes = true;
 
        x = (j-startRes)*av.charWidth;
 
diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 77f557b..b8d35dc 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -432,7 +432,10 @@ public class AnnotationPanel extends JPanel implements MouseListener, MouseMotio
 
       for(j=startRes; j<endRes; j++)
       {
-        validRes = row.annotations[j]==null?false:true;
+        if(row.annotations.length<=j || row.annotations[j]==null)
+        validRes = false;
+       else
+         validRes = true;
 
        x = (j-startRes)*av.charWidth;