JAL-2349 better names for getColourForRange parameters

diff --git a/src/jalview/datamodel/ContactListI.java b/src/jalview/datamodel/ContactListI.java
index 0459732..84fcb7c 100644 (file)
--- a/src/jalview/datamodel/ContactListI.java
+++ b/src/jalview/datamodel/ContactListI.java
@@ -14,11 +14,11 @@ public interface ContactListI
   /**
    * return colour representing contacts from i through to j for this site
    * 
-   * @param i
-   * @param j
+   * @param from_column
+   * @param to_column
    * @return
    */
-  Color getColorForRange(int i, int j);
+  Color getColorForRange(int from_column, int to_column);
   
   /**
    * get a value representing contact at column for this site

diff --git a/src/jalview/datamodel/ContactMatrixTest.java b/src/jalview/datamodel/ContactMatrixTest.java
index 96eb783..64db2ea 100644 (file)
--- a/src/jalview/datamodel/ContactMatrixTest.java
+++ b/src/jalview/datamodel/ContactMatrixTest.java
@@ -25,10 +25,10 @@ public class ContactMatrixTest implements ContactMatrixI
         return jalview.util.ColorUtils.getGraduatedColour(Math.abs(column-p), 0, Color.white, width, Color.magenta);
       }
       @Override
-      public Color getColorForRange(int i, int j)
+      public Color getColorForRange(int from_column, int to_column)
       {
         return jalview.util.ColorUtils.getGraduatedColour(
-                Math.abs(j + i - 2 * p) / 2, 0, Color.white, width,
+                Math.abs(to_column + from_column - 2 * p) / 2, 0, Color.white, width,
                 Color.magenta);
       }