git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4369 invokeAndWait to avoid hang whilst calling getFiles if a Jmol redraw is...
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemeLoader.java
diff --git
a/src/jalview/schemes/ColourSchemeLoader.java
b/src/jalview/schemes/ColourSchemeLoader.java
index
141ef10
..
742e31d
100644
(file)
--- a/
src/jalview/schemes/ColourSchemeLoader.java
+++ b/
src/jalview/schemes/ColourSchemeLoader.java
@@
-20,6
+20,8
@@
*/
package jalview.schemes;
*/
package jalview.schemes;
+import java.util.Locale;
+
import jalview.xml.binding.jalview.JalviewUserColours;
import java.awt.Color;
import jalview.xml.binding.jalview.JalviewUserColours;
import java.awt.Color;
@@
-92,7
+94,7
@@
public class ColourSchemeLoader
Color color = new Color(
Integer.parseInt(jucs.getColour().get(i).getRGB(), 16));
Color color = new Color(
Integer.parseInt(jucs.getColour().get(i).getRGB(), 16));
- if (name.toLowerCase().equals(name))
+ if (name.toLowerCase(Locale.ROOT).equals(name))
{
caseSensitive = true;
lowerCase[index] = color;
{
caseSensitive = true;
lowerCase[index] = color;
@@
-115,8
+117,8
@@
public class ColourSchemeLoader
} catch (Exception ex)
{
// used to try to parse a V1 Castor generated colours file
} catch (Exception ex)
{
// used to try to parse a V1 Castor generated colours file
- System.err.println("Failed to read colour scheme from " + filePath
- + " : " + ex.toString());
+ jalview.bin.Console.errPrintln("Failed to read colour scheme from "
+ + filePath + " : " + ex.toString());
}
return ucs;
}
return ucs;