X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=e9aae5216f9ecde9b08b2030f892486c489e7e7a;hb=25aaaa87042b3f507ad4348120df7dd073182759;hp=29d936f0f02d063cebaf25a32f7999e7cc1d534b;hpb=79055a2b32dc168ce6fb0b9de366007945d51254;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 29d936f..e9aae52 100644
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
  * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
@@ -138,9 +138,8 @@ public class AlignViewport extends AlignmentViewport implements
   Color textColour = Color.black;
 
   Color textColour2 = Color.white;
-  private boolean rightAlignIds = false;
 
-  private AnnotationColumnChooser 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();
   }
@@ -1010,23 +991,6 @@ public class AlignViewport extends AlignmentViewport implements
     shownpfeats = show;
   }
 
-  /**
-   * 
-   * @return true if view has hidden rows
-   */
-  public boolean hasHiddenRows()
-  {
-    return hasHiddenRows;
-  }
-
-  /**
-   * 
-   * @return true if view has hidden columns
-   */
-  public boolean hasHiddenColumns()
-  {
-    return hasHiddenColumns;
-  }
 
   /**
    * when set, view will scroll to show the highlighted position
@@ -1235,30 +1199,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 AnnotationColumnChooser getCurrentAnnotationColumnSelectionState()
+  public AnnotationColumnChooser getAnnotationColumnSelectionState()
   {
-    return currentAnnotationColumnSelectionState;
+    return annotationColumnSelectionState;
   }
 
-  public void setCurrentAnnotationColumnSelectionState(
+  public void setAnnotationColumnSelectionState(
           AnnotationColumnChooser currentAnnotationColumnSelectionState)
   {
-    this.currentAnnotationColumnSelectionState = currentAnnotationColumnSelectionState;
+    this.annotationColumnSelectionState = currentAnnotationColumnSelectionState;
   }
 }