JAL-969 drop the hiddenColumns flag in favour of checking current state of columnSele...

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index dd61c79..a2ed7cd 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.
    * 
@@ -196,16 +195,7 @@ public class AlignViewport extends AlignmentViewport implements
     setAlignment(al);
     if (hiddenColumns != null)
     {
-      this.colSel = hiddenColumns;
-      if (hiddenColumns.getHiddenColumns() != null
-              && hiddenColumns.getHiddenColumns().size() > 0)
-      {
-        hasHiddenColumns = true;
-      }
-      else
-      {
-        hasHiddenColumns = false;
-      }
+      colSel = hiddenColumns;
     }
     init();
   }
@@ -252,16 +242,7 @@ public class AlignViewport extends AlignmentViewport implements
     setAlignment(al);
     if (hiddenColumns != null)
     {
-      this.colSel = hiddenColumns;
-      if (hiddenColumns.getHiddenColumns() != null
-              && hiddenColumns.getHiddenColumns().size() > 0)
-      {
-        hasHiddenColumns = true;
-      }
-      else
-      {
-        hasHiddenColumns = false;
-      }
+      colSel = hiddenColumns;
     }
     init();
   }
@@ -1020,15 +1001,6 @@ public class AlignViewport extends AlignmentViewport implements
   }
 
   /**
-   * 
-   * @return true if view has hidden columns
-   */
-  public boolean hasHiddenColumns()
-  {
-    return hasHiddenColumns;
-  }
-
-  /**
    * when set, view will scroll to show the highlighted position
    */
   public boolean followHighlight = true;
@@ -1235,30 +1207,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;
   }
 }