Formatted source

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

diff --git a/src/jalview/schemes/ScoreColourScheme.java b/src/jalview/schemes/ScoreColourScheme.java
index b6dc45b..12f252d 100755 (executable)
--- a/src/jalview/schemes/ScoreColourScheme.java
+++ b/src/jalview/schemes/ScoreColourScheme.java
@@ -16,55 +16,53 @@
 * along with this program; if not, write to the Free Software\r
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
 */\r
-\r
 package jalview.schemes;\r
 \r
 import java.awt.*;\r
 \r
-public class ScoreColourScheme extends ResidueColourScheme {\r
-  public double min;\r
-  public double max;\r
-  public double[] scores;\r
-\r
-  public ScoreColourScheme( double[] scores,\r
-                          double min,\r
-                          double max) {\r
 \r
-    super();\r
+public class ScoreColourScheme extends ResidueColourScheme {\r
+    public double min;\r
+    public double max;\r
+    public double[] scores;\r
 \r
-    this.scores = scores;\r
-    this.min = min;\r
-    this.max = max;\r
-  }\r
+    public ScoreColourScheme(double[] scores, double min, double max) {\r
+        super();\r
 \r
+        this.scores = scores;\r
+        this.min = min;\r
+        this.max = max;\r
+    }\r
 \r
-    public Color findColour(String s,int j)\r
-    {\r
+    public Color findColour(String s, int j) {\r
+        if (threshold > 0) {\r
+            if (!aboveThreshold(s, j)) {\r
+                return Color.white;\r
+            }\r
+        }\r
 \r
-      if (threshold > 0)\r
-      {\r
-         if (!aboveThreshold(s,j))\r
-             return Color.white;\r
-      }\r
+        float red = (float) (scores[((Integer) ResidueProperties.aaHash.get(s)).intValue()] -\r
+            (float) min) / (float) (max - min);\r
 \r
-       float red = (float)(scores[((Integer)ResidueProperties.aaHash.get(s)).intValue()]\r
-                           - (float)min)/(float)(max - min);\r
-       if (red > 1.0f)\r
-           red = 1.0f;\r
+        if (red > 1.0f) {\r
+            red = 1.0f;\r
+        }\r
 \r
-       if (red < 0.0f)\r
-           red = 0.0f;\r
+        if (red < 0.0f) {\r
+            red = 0.0f;\r
+        }\r
 \r
-    char c = s.charAt(0);\r
+        char c = s.charAt(0);\r
 \r
-    if(jalview.util.Comparison.isGap((c)))\r
-        return Color.white;\r
+        if (jalview.util.Comparison.isGap((c))) {\r
+            return Color.white;\r
+        }\r
 \r
-       // This isn';t great - pool of colours in here?\r
-       return makeColour(red);\r
+        // This isn';t great - pool of colours in here?\r
+        return makeColour(red);\r
     }\r
+\r
     public Color makeColour(float c) {\r
-       return new Color(c,(float)0.0,(float)1.0-c);\r
+        return new Color(c, (float) 0.0, (float) 1.0 - c);\r
     }\r
 }\r
-\r