Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

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

diff --git a/src/jalview/datamodel/ContactListI.java b/src/jalview/datamodel/ContactListI.java
index 0459732..da55403 100644 (file)
--- a/src/jalview/datamodel/ContactListI.java
+++ b/src/jalview/datamodel/ContactListI.java
@@ -2,30 +2,22 @@ package jalview.datamodel;
 
 import java.awt.Color;
 
-public interface ContactListI
-{
-
-  int getColumnWidth();
+import jalview.renderer.ContactGeometry.contactInterval;
 
-  int getContactHeight();
-
-  Color getColorForScore(int column);
+public interface ContactListI extends ContactListProviderI
+{
 
   /**
-   * return colour representing contacts from i through to j for this site
-   * 
-   * @param i
-   * @param j
-   * @return
-   */
-  Color getColorForRange(int i, int j);
-  
-  /**
-   * get a value representing contact at column for this site
+   * return bounds for range
    * 
-   * @param column
-   * @return
+   * @param from_column
+   * @param to_column
+   * @return double[] { min, max,
    */
-  double getContactAt(int column);
+  ContactRange getRangeFor(int from_column, int to_column);
 
+  default Color getColourForGroup()
+  {
+    return null;
+  }
 }