JAL-2388 Renamed viewport position props to viewport ranges

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

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index f1bb8de..11321eb 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -51,7 +51,7 @@ import jalview.structure.StructureSelectionManager;
 import jalview.structure.VamsasSource;
 import jalview.util.MessageManager;
 import jalview.viewmodel.AlignmentViewport;
-import jalview.viewmodel.ViewportPositionProps;
+import jalview.viewmodel.ViewportRanges;
 import jalview.ws.params.AutoCalcSetting;
 
 import java.awt.Container;
@@ -150,11 +150,10 @@ public class AlignViewport extends AlignmentViewport implements
   public AlignViewport(AlignmentI al, ColumnSelection hiddenColumns)
   {
     setAlignment(al);
-    posProps.setHiddenColumns(hiddenColumns);
-    /*if (hiddenColumns != null)
+    if (hiddenColumns != null)
     {
       colSel = hiddenColumns;
-    }*/
+    }
     init();
   }
 
@@ -198,11 +197,10 @@ public class AlignViewport extends AlignmentViewport implements
       Cache.log.debug("Setting viewport's view id : " + viewId);
     }
     setAlignment(al);
-    posProps.setHiddenColumns(hiddenColumns);
-    /*if (hiddenColumns != null)
+    if (hiddenColumns != null)
     {
       colSel = hiddenColumns;
-    }*/
+    }
     init();
   }
 
@@ -240,11 +238,7 @@ public class AlignViewport extends AlignmentViewport implements
 
   void init()
   {
-
-    /*setStartRes(0);
-    setEndRes(alignment.getWidth() - 1);
-    setStartSeq(0);
-    setEndSeq(alignment.getHeight() - 1);*/
+    ranges = new ViewportRanges(this.alignment);
     applyViewProperties();
 
     String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
@@ -311,8 +305,6 @@ public class AlignViewport extends AlignmentViewport implements
     {
       residueShading.setConsensus(hconsensus);
     }
-
-    posProps = new ViewportPositionProps(this.alignment, this.viewStyle);
   }
 
   /**
@@ -535,9 +527,7 @@ public class AlignViewport extends AlignmentViewport implements
     {
       end = alignment.getWidth();
     }
-    viscontigs = posProps.getColumnSelection()
-            .getVisibleContigs(start, end);
-    // viscontigs = colSel.getVisibleContigs(start, end);
+    viscontigs = colSel.getVisibleContigs(start, end);
     return viscontigs;
   }