X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FScoreColourScheme.java;h=12f252d69106e6cc70d73092b0adc162f90f2007;hb=588042b69abf8e60bcc950b24c283933c7dd422f;hp=b6dc45b18a0fbe02cd72ceda70d01a8034bc2756;hpb=5cd8e373c75fb348ecda4d94d8a46468fb92756d;p=jalview.git

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