X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FConservation.java;h=cbc4dcae3130c89b40ccf47d77dfd7e488cd2194;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=ff38c08303ef5798a804a8f1c5ab9107d7a7111f;hpb=17e4ea278bc9a5fb280db1252ce78b7a295215f5;p=jalview.git diff --git a/src/jalview/analysis/Conservation.java b/src/jalview/analysis/Conservation.java index ff38c08..cbc4dca 100755 --- a/src/jalview/analysis/Conservation.java +++ b/src/jalview/analysis/Conservation.java @@ -20,6 +20,8 @@ */ package jalview.analysis; +import java.util.Locale; + import jalview.analysis.scoremodels.ScoreMatrix; import jalview.analysis.scoremodels.ScoreModels; import jalview.datamodel.AlignmentAnnotation; @@ -312,7 +314,7 @@ public class Conservation protected static void recordConservation(Map resultMap, String res) { - res = res.toUpperCase(); + res = res.toUpperCase(Locale.ROOT); for (Entry> property : ResidueProperties.propHash .entrySet()) { @@ -812,8 +814,8 @@ public class Conservation float vprop = value - qmin; vprop /= qmax; String description = FORMAT_3DP.form(value); - quality2.annotations[i] = new Annotation(" ", description, - ' ', value, new Color(minR + (maxR * vprop), + quality2.annotations[i] = new Annotation(" ", description, ' ', + value, new Color(minR + (maxR * vprop), minG + (maxG * vprop), minB + (maxB * vprop))); } }