JAL-2360 refactoring for JalviewColourScheme enum,

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

diff --git a/src/jalview/schemes/HydrophobicColourScheme.java b/src/jalview/schemes/HydrophobicColourScheme.java
index 56a00ca..121b864 100755 (executable)
--- a/src/jalview/schemes/HydrophobicColourScheme.java
+++ b/src/jalview/schemes/HydrophobicColourScheme.java
@@ -1,23 +1,26 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 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.
- * 
+ * 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/>.
+ * 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.schemes;
 
-import java.awt.*;
+import java.awt.Color;
 
 /**
  * DOCUMENT ME!
@@ -32,8 +35,8 @@ public class HydrophobicColourScheme extends ScoreColourScheme
    */
   public HydrophobicColourScheme()
   {
-    super(ResidueProperties.hyd, ResidueProperties.hydmin,
-            ResidueProperties.hydmax);
+    super(ResidueProperties.aaIndex, ResidueProperties.hyd,
+            ResidueProperties.hydmin, ResidueProperties.hydmax);
   }
 
   /**
@@ -44,8 +47,21 @@ public class HydrophobicColourScheme extends ScoreColourScheme
    * 
    * @return DOCUMENT ME!
    */
+  @Override
   public Color makeColour(float c)
   {
     return new Color(c, (float) 0.0, (float) 1.0 - c);
   }
+
+  @Override
+  public boolean isPeptideSpecific()
+  {
+    return true;
+  }
+
+  @Override
+  public String getSchemeName()
+  {
+    return JalviewColourScheme.Hydrophobic.toString();
+  }
 }