Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

[jalview.git] / src / jalview / datamodel / ContactListImpl.java

diff --git a/src/jalview/datamodel/ContactListImpl.java b/src/jalview/datamodel/ContactListImpl.java
index 8e806e4..bb31c5d 100644 (file)
--- 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
  * 
@@ -51,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);
@@ -95,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();
+  }
 }