Merge branch 'releases/Release_2_11_3_Branch'

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

diff --git a/src/jalview/datamodel/ContactListI.java b/src/jalview/datamodel/ContactListI.java
index 0459732..ba14244 100644 (file)
--- a/src/jalview/datamodel/ContactListI.java
+++ b/src/jalview/datamodel/ContactListI.java
@@ -1,31 +1,43 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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;
+  }
 }