X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FContactListImpl.java;h=bb31c5d6ca76f497e0d94c00702ed9edb0810d04;hb=1624d4fc89f17c4a6cdb80b7d4cc37a095b6fe67;hp=561048eb144bff37c82de94d9536a6a5a0998208;hpb=48935da8225797aada1fe5f0863385b6b57ee67e;p=jalview.git

diff --git a/src/jalview/datamodel/ContactListImpl.java b/src/jalview/datamodel/ContactListImpl.java
index 561048e..bb31c5d 100644
--- a/src/jalview/datamodel/ContactListImpl.java
+++ b/src/jalview/datamodel/ContactListImpl.java
@@ -1,5 +1,9 @@
 package jalview.datamodel;
 
+import java.awt.Color;
+
+import jalview.renderer.ContactGeometry.contactInterval;
+
 /**
  * helper class to compute min/max/mean for a range on a contact list
  * 
@@ -21,6 +25,12 @@ public class ContactListImpl implements ContactListI
   }
 
   @Override
+  public int getPosition()
+  {
+    return clist.getPosition();
+  }
+
+  @Override
   public double getContactAt(int column)
   {
     return clist.getContactAt(column);
@@ -35,6 +45,7 @@ public class ContactListImpl implements ContactListI
   @Override
   public ContactRange getRangeFor(int from_column, int to_column)
   {
+    // TODO: consider caching ContactRange for a particular call ?
     if (clist instanceof ContactListI)
     {
       // clist may implement getRangeFor in a more efficient way, so use theirs
@@ -44,9 +55,9 @@ public class ContactListImpl implements ContactListI
     {
       from_column = 0;
     }
-    if (to_column > getContactHeight())
+    if (to_column >= getContactHeight())
     {
-      to_column = getContactHeight();
+      to_column = getContactHeight()-1;
     }
     ContactRange cr = new ContactRange();
     cr.setFrom_column(from_column);
@@ -88,4 +99,15 @@ public class ContactListImpl implements ContactListI
     return cr;
   }
 
+  @Override
+  public int[] getMappedPositionsFor(int cStart, int cEnd)
+  {
+    return clist.getMappedPositionsFor(cStart, cEnd);
+  }
+
+  @Override
+  public Color getColourForGroup()
+  {
+    return clist.getColourForGroup();
+  }
 }