JAL-2388 First move of endRes etc out of AlignmentViewport (in progress)

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index b728efc..41248b1 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -78,6 +78,8 @@ import java.util.Map;
 public abstract class AlignmentViewport implements AlignViewportI,
         CommandListener, VamsasSource
 {
+  protected ViewportPositionProps posProps;
+
   protected ViewStyleI viewStyle = new ViewStyle();
 
   /**
@@ -1285,13 +1287,13 @@ public abstract class AlignmentViewport implements AlignViewportI,
    */
   private boolean followHighlight = true;
 
-  private int startRes;
+  /*private int startRes;
 
   private int endRes;
 
   private int startSeq;
 
-  private int endSeq;
+  private int endSeq;*/
 
   /**
    * Property change listener for changes in alignment
@@ -2645,36 +2647,45 @@ public abstract class AlignmentViewport implements AlignViewportI,
   }
 
   @Override
+  public ViewportPositionProps getPosProps()
+  {
+    return posProps;
+  }
+
+  @Override
   public int getStartRes()
   {
-    return startRes;
+    return posProps.getStartRes();
   }
 
   @Override
   public int getEndRes()
   {
-    return endRes;
+    return posProps.getEndRes();
   }
 
   @Override
   public int getStartSeq()
   {
-    return startSeq;
+    return posProps.getStartSeq();
   }
 
   public void setStartRes(int res)
   {
-    this.startRes = res;
+    posProps.setStartRes(res);
+    // this.startRes = res;
   }
 
   public void setStartSeq(int seq)
   {
-    this.startSeq = seq;
+    posProps.setStartSeq(seq);
+    // this.startSeq = seq;
   }
 
   public void setEndRes(int res)
   {
-    if (res > alignment.getWidth() - 1)
+    posProps.setEndRes(res);
+    /*if (res > alignment.getWidth() - 1)
     {
       // log.System.out.println(" Corrected res from " + res + " to maximum " +
       // (alignment.getWidth()-1));
@@ -2684,12 +2695,13 @@ public abstract class AlignmentViewport implements AlignViewportI,
     {
       res = 0;
     }
-    this.endRes = res;
+    this.endRes = res;*/
   }
 
   public void setEndSeq(int seq)
   {
-    if (seq > alignment.getHeight())
+    posProps.setEndSeq(seq);
+    /*if (seq > alignment.getHeight())
     {
       seq = alignment.getHeight();
     }
@@ -2697,13 +2709,14 @@ public abstract class AlignmentViewport implements AlignViewportI,
     {
       seq = 0;
     }
-    this.endSeq = seq;
+    this.endSeq = seq;*/
   }
 
   @Override
   public int getEndSeq()
   {
-    return endSeq;
+    return posProps.getEndSeq();
+    // return endSeq;
   }
 
   /**