JAL-3215 refactored ScoreColourScheme construction for scriptability

[jalview.git] / src / jalview / schemes / HydrophobicColourScheme.java

diff --git a/src/jalview/schemes/HydrophobicColourScheme.java b/src/jalview/schemes/HydrophobicColourScheme.java
index c8cf4c7..e91f469 100755 (executable)
--- a/src/jalview/schemes/HydrophobicColourScheme.java
+++ b/src/jalview/schemes/HydrophobicColourScheme.java
@@ -26,33 +26,26 @@ import jalview.datamodel.AnnotatedCollectionI;
 import java.awt.Color;
 
 /**
- * DOCUMENT ME!
+ * A hydrophobicity colour scheme based on
  * 
- * @author $author$
- * @version $Revision$
+ * <pre>
+ * Kyte, J., and Doolittle, R.F., J. Mol. Biol. 1157, 105-132, 1982
+ * </pre>
  */
 public class HydrophobicColourScheme extends ScoreColourScheme
 {
-  /**
-   * Creates a new HydrophobicColourScheme object.
-   */
-  public HydrophobicColourScheme()
-  {
-    super(ResidueProperties.aaIndex, ResidueProperties.hyd);
-  }
+  private static final Color minScoreColour = new Color(0, 0, 255);
+
+  private static final Color maxScoreColour = new Color(255, 0, 0);
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param c
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
+   * Constructor
    */
-  @Override
-  public Color makeColour(float c)
+  public HydrophobicColourScheme()
   {
-    return new Color(c, (float) 0.0, (float) 1.0 - c);
+    super(JalviewColourScheme.Hydrophobic.toString(),
+            ResidueProperties.aaIndex, ResidueProperties.hyd,
+            minScoreColour, maxScoreColour);
   }
 
   @Override
@@ -61,12 +54,6 @@ public class HydrophobicColourScheme extends ScoreColourScheme
     return true;
   }
 
-  @Override
-  public String getSchemeName()
-  {
-    return JalviewColourScheme.Hydrophobic.toString();
-  }
-
   /**
    * Returns a new instance of this colour scheme with which the given data may
    * be coloured