From: jprocter <Jim Procter>
Date: Tue, 29 Jun 2010 15:21:16 +0000 (+0000)
Subject: patch for npe that occurs for importing Jalview projects where group conservation... 
X-Git-Tag: Release_2_6~159
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cf4f0796ccc2d70bad2675e2feda184e5bef7a79;p=jalview.git

patch for npe that occurs for importing Jalview projects where group conservation is displayed but no conservation for alignment is displayed - (observed during Jmol patching)
---

diff --git a/src/jalview/analysis/AAFrequency.java b/src/jalview/analysis/AAFrequency.java
index bc178df..46264d6 100755
--- a/src/jalview/analysis/AAFrequency.java
+++ b/src/jalview/analysis/AAFrequency.java
@@ -204,6 +204,11 @@ public class AAFrequency
           boolean includeAllConsSymbols, char[] alphabet)
   {
     float tval, value;
+    if (consensus==null || consensus.annotations==null || consensus.annotations.length<width)
+    {
+      // called with a bad alignment annotation row - wait for it to be initialised properly
+      return;
+    }
     for (int i = iStart; i < width; i++)
     {
       value = 0;