X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FFeatureColour.java;h=20b0796041ef3e794b9b44b1463f86a80aae852c;hb=9bfda76754fb426a471e1c12c9f0ca0c4c1784bc;hp=e5bda58f853bb16173a6a21765b69e8fec7760e1;hpb=9d2408483e451285fd555c3cd6e0273977acbaa7;p=jalview.git
diff --git a/src/jalview/schemes/FeatureColour.java b/src/jalview/schemes/FeatureColour.java
index e5bda58..20b0796 100644
--- a/src/jalview/schemes/FeatureColour.java
+++ b/src/jalview/schemes/FeatureColour.java
@@ -48,8 +48,9 @@ import java.util.StringTokenizer;
*
the range may be the full value range, or may be limited by the threshold
* value
*
- * colour by (text) value of a named attribute graduated colour by
- * (numeric) value of a named attribute
+ * colour by (text) value of a named attribute
+ * graduated colour by (numeric) value of a named attribute
+ *
*/
public class FeatureColour implements FeatureColourI
{
@@ -394,7 +395,7 @@ public class FeatureColour implements FeatureColourI
{
if (!ttype.toLowerCase(Locale.ROOT).startsWith("no"))
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Ignoring unrecognised threshold type : " + ttype);
}
}
@@ -408,19 +409,20 @@ public class FeatureColour implements FeatureColourI
featureColour.setThreshold(Float.valueOf(tval).floatValue());
} catch (Exception e)
{
- System.err.println("Couldn't parse threshold value as a float: ("
- + tval + ")");
+ jalview.bin.Console
+ .errPrintln("Couldn't parse threshold value as a float: ("
+ + tval + ")");
}
}
if (gcol.hasMoreTokens())
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Ignoring additional tokens in parameters in graduated colour specification\n");
while (gcol.hasMoreTokens())
{
- System.err.println(BAR + gcol.nextToken());
+ jalview.bin.Console.errPrintln(BAR + gcol.nextToken());
}
- System.err.println("\n");
+ jalview.bin.Console.errPrintln("\n");
}
return featureColour;
} catch (Exception e)
@@ -698,8 +700,8 @@ public class FeatureColour implements FeatureColourI
{
String label = attributeName == null ? feature.getDescription()
: feature.getValueAsString(attributeName);
- return label == null ? noColour : ColorUtils
- .createColourFromName(label);
+ return label == null ? noColour
+ : ColorUtils.createColourFromName(label);
}
if (!isGraduatedColour())
@@ -825,7 +827,7 @@ public class FeatureColour implements FeatureColourI
sb.append(BAR).append(Format.getHexString(getMinColour()))
.append(BAR);
sb.append(Format.getHexString(getMaxColour())).append(BAR);
-
+
/*
* 'no value' colour should be null, min or max colour;
* if none of these, coerce to minColour