From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 12 Sep 2005 16:59:42 +0000 (+0000)
Subject: null pointers removed
X-Git-Tag: Release_2_05b~44
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=21930635bd32076820fe0f474bd8f8f89b84dff2;hp=83618218fa25c00b54171248156d68f81b5d2e4c;p=jalview.git

null pointers removed
---

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index ec5fbc6..f7ba2fe 100755
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -130,6 +130,9 @@ public class AnnotationPanel
     if (activeRow == -1)
     {
       AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
+      if(aa ==null)
+        return;
+
       for (int j = 0; j < aa.length; j++)
       {
         if (aa[j].editable)
diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index f13bc91..5f0d3c8 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -148,7 +148,9 @@ public class AnnotationPanel extends JPanel implements MouseListener,
         if (activeRow == -1)
         {
             AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
-            if(aa!=null)
+            if(aa==null)
+              return;
+
             for (int j = 0; j < aa.length; j++)
             {
                 if (aa[j].editable)