JAL-1807 still testing

[jalviewjs.git] / bin / jalview / util / ColorUtils.js

diff --git a/bin/jalview/util/ColorUtils.js b/bin/jalview/util/ColorUtils.js
index ed016da..129c265 100644 (file)
--- a/bin/jalview/util/ColorUtils.js
+++ b/bin/jalview/util/ColorUtils.js
@@ -1,30 +1,30 @@
-Clazz.declarePackage ("jalview.util");
-Clazz.load (null, "jalview.util.ColorUtils", ["java.awt.Color", "java.util.Random"], function () {
-c$ = Clazz.declareType (jalview.util, "ColorUtils");
-c$.generateRandomColor = Clazz.defineMethod (c$, "generateRandomColor", 
-function (mix) {
-var random =  new java.util.Random ();
-var red = random.nextInt (256);
-var green = random.nextInt (256);
-var blue = random.nextInt (256);
-if (mix != null) {
-red = Clazz.doubleToInt ((red + mix.getRed ()) / 2);
-green = Clazz.doubleToInt ((green + mix.getGreen ()) / 2);
-blue = Clazz.doubleToInt ((blue + mix.getBlue ()) / 2);
-}var color =  new java.awt.Color (red, green, blue);
-return color;
-}, "java.awt.Color");
-c$.toTkCode = Clazz.defineMethod (c$, "toTkCode", 
-function (colour) {
-var colstring = "#" + ((colour.getRed () < 16) ? "0" : "") + Integer.toHexString (colour.getRed ()) + ((colour.getGreen () < 16) ? "0" : "") + Integer.toHexString (colour.getGreen ()) + ((colour.getBlue () < 16) ? "0" : "") + Integer.toHexString (colour.getBlue ());
-return colstring;
-}, "java.awt.Color");
-c$.darkerThan = Clazz.defineMethod (c$, "darkerThan", 
-function (col) {
-return col == null ? null : col.darker ().darker ().darker ();
-}, "java.awt.Color");
-c$.brighterThan = Clazz.defineMethod (c$, "brighterThan", 
-function (col) {
-return col == null ? null : col.brighter ().brighter ().brighter ();
-}, "java.awt.Color");
-});
+Clazz.declarePackage ("jalview.util");\r
+Clazz.load (null, "jalview.util.ColorUtils", ["java.awt.Color", "java.util.Random"], function () {\r
+c$ = Clazz.declareType (jalview.util, "ColorUtils");\r
+c$.generateRandomColor = Clazz.defineMethod (c$, "generateRandomColor", \r
+function (mix) {\r
+var random =  new java.util.Random ();\r
+var red = random.nextInt (256);\r
+var green = random.nextInt (256);\r
+var blue = random.nextInt (256);\r
+if (mix != null) {\r
+red = Clazz.doubleToInt ((red + mix.getRed ()) / 2);\r
+green = Clazz.doubleToInt ((green + mix.getGreen ()) / 2);\r
+blue = Clazz.doubleToInt ((blue + mix.getBlue ()) / 2);\r
+}var color =  new java.awt.Color (red, green, blue);\r
+return color;\r
+}, "java.awt.Color");\r
+c$.toTkCode = Clazz.defineMethod (c$, "toTkCode", \r
+function (colour) {\r
+var colstring = "#" + ((colour.getRed () < 16) ? "0" : "") + Integer.toHexString (colour.getRed ()) + ((colour.getGreen () < 16) ? "0" : "") + Integer.toHexString (colour.getGreen ()) + ((colour.getBlue () < 16) ? "0" : "") + Integer.toHexString (colour.getBlue ());\r
+return colstring;\r
+}, "java.awt.Color");\r
+c$.darkerThan = Clazz.defineMethod (c$, "darkerThan", \r
+function (col) {\r
+return col == null ? null : col.darker ().darker ().darker ();\r
+}, "java.awt.Color");\r
+c$.brighterThan = Clazz.defineMethod (c$, "brighterThan", \r
+function (col) {\r
+return col == null ? null : col.brighter ().brighter ().brighter ();\r
+}, "java.awt.Color");\r
+});\r