From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 26 May 2005 09:51:43 +0000 (+0000)
Subject: toString modified
X-Git-Tag: Release_2_0~176
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=971dac64809c72dcd2f2fe050711b1fa91f69f39;p=jalview.git

toString modified
---

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 8326c3a..7b558c3 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -75,9 +75,28 @@ public class AlignmentAnnotation
     StringBuffer buffer = new StringBuffer();
     for(int i=0; i<annotations.length; i++)
    {
-     buffer.append( annotations[i].value );
+     if(annotations[i]!=null)
+     {
+       if(isGraph)
+         buffer.append(annotations[i].value);
+       else if(hasIcons)
+         buffer.append(annotations[i].secondaryStructure);
+       else
+         buffer.append(annotations[i].displayCharacter);
+
+     }
      buffer.append(", ");
    }
+   if(label.equals("Consensus"))
+   {
+     buffer.append("\n");
+     for (int i = 0; i < annotations.length; i++)
+     {
+       if (annotations[i] != null)
+           buffer.append(annotations[i].description);
+       buffer.append(", ");
+     }
+   }
    return buffer.toString();
   }