individual label format settings for each annotation row. Removed excess term in...

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 81e9afe..d8ad4fc 100755 (executable)
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -103,6 +103,21 @@ public class AlignmentAnnotation
 
   public SequenceGroup groupRef =null ;
 
+  /**
+   * display every column label, even if there is a row of identical labels
+   */
+  public boolean showAllColLabels=false;
+  
+  /**
+   * scale the column label to fit within the alignment column.
+   */
+  public boolean scaleColLabel = false;
+
+  /**
+   * centre the column labels relative to the alignment column
+   */
+  public boolean centreColLabels = false;
+
   
   /* (non-Javadoc)
    * @see java.lang.Object#finalize()
@@ -186,7 +201,6 @@ public class AlignmentAnnotation
         firstChar != 'H'
                 && firstChar != 'E'
                 && firstChar != '-'
-                && firstChar != '-'
                 && firstChar < jalview.schemes.ResidueProperties.aaIndex.length)
         {
           if (jalview.schemes.ResidueProperties.aaIndex[firstChar] < 23)