JAL-1553 merge commit

diff --cc src/jalview/gui/AlignFrame.java
Simple merge

diff --cc src/jalview/gui/AlignViewport.java
index 38f0ea1,10e14d1..dd61c79
--- 1/src/jalview/gui/AlignViewport.java
--- 2/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -138,6 -148,10 +138,9 @@@ public class AlignViewport extends Alig
    Color textColour = Color.black;
  
    Color textColour2 = Color.white;
 -
+   private boolean rightAlignIds = false;
+ 
+   private AnnotationColumnSelection currentAnnotationColumnSelectionState;
    /**
     * Creates a new AlignViewport object.
     * 
@@@ -1231,4 -1304,30 +1234,31 @@@
    {
      this.showAutocalculatedAbove = showAutocalculatedAbove;
    }
+ 
++
+   public boolean isShowAnnotation()
+   {
 -    return showAnnotation;
++    return super.isShowAnnotation();
+   }
+ 
+   public boolean isRightAlignIds()
+   {
+     return rightAlignIds;
+   }
+ 
+   public void setRightAlignIds(boolean rightAlignIds)
+   {
+     this.rightAlignIds = rightAlignIds;
+   }
+ 
+   public AnnotationColumnSelection getCurrentAnnotationColumnSelectionState()
+   {
+     return currentAnnotationColumnSelectionState;
+   }
+ 
+   public void setCurrentAnnotationColumnSelectionState(
+           AnnotationColumnSelection currentAnnotationColumnSelectionState)
+   {
+     this.currentAnnotationColumnSelectionState = currentAnnotationColumnSelectionState;
+   }
  }