JAL-1628 drop getShowAnnotation accessor in favour of isShowAnnotation in AlignViewpo...

[jalview.git] / src / jalview / gui / AlignViewport.java

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index dd61c79..4df9a62 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -138,9 +138,8 @@ public class AlignViewport extends AlignmentViewport implements
   Color textColour = Color.black;
 
   Color textColour2 = Color.white;
-  private boolean rightAlignIds = false;
 
-  private AnnotationColumnSelection currentAnnotationColumnSelectionState;
+  private AnnotationColumnChooser annotationColumnSelectionState;
   /**
    * Creates a new AlignViewport object.
    * 
@@ -1235,30 +1234,14 @@ public class AlignViewport extends AlignmentViewport implements
     this.showAutocalculatedAbove = showAutocalculatedAbove;
   }
 
-
-  public boolean isShowAnnotation()
-  {
-    return super.isShowAnnotation();
-  }
-
-  public boolean isRightAlignIds()
-  {
-    return rightAlignIds;
-  }
-
-  public void setRightAlignIds(boolean rightAlignIds)
-  {
-    this.rightAlignIds = rightAlignIds;
-  }
-
-  public AnnotationColumnSelection getCurrentAnnotationColumnSelectionState()
+  public AnnotationColumnChooser getAnnotationColumnSelectionState()
   {
-    return currentAnnotationColumnSelectionState;
+    return annotationColumnSelectionState;
   }
 
-  public void setCurrentAnnotationColumnSelectionState(
-          AnnotationColumnSelection currentAnnotationColumnSelectionState)
+  public void setAnnotationColumnSelectionState(
+          AnnotationColumnChooser currentAnnotationColumnSelectionState)
   {
-    this.currentAnnotationColumnSelectionState = currentAnnotationColumnSelectionState;
+    this.annotationColumnSelectionState = currentAnnotationColumnSelectionState;
   }
 }