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-2023 avoid writing / loading empty mappings
[jalview.git]
/
src
/
jalview
/
schemes
/
UserColourScheme.java
diff --git
a/src/jalview/schemes/UserColourScheme.java
b/src/jalview/schemes/UserColourScheme.java
index
b1e4d58
..
9ae14ca
100755
(executable)
--- a/
src/jalview/schemes/UserColourScheme.java
+++ b/
src/jalview/schemes/UserColourScheme.java
@@
-101,6
+101,10
@@
public class UserColourScheme extends ResidueColourScheme
public static Color getColourFromString(String colour)
{
public static Color getColourFromString(String colour)
{
+ if (colour == null)
+ {
+ return null;
+ }
colour = colour.trim();
Color col = null;
colour = colour.trim();
Color col = null;
@@
-136,7
+140,7
@@
public class UserColourScheme extends ResidueColourScheme
}
}
- public Color createColourFromName(String name)
+ public static Color createColourFromName(String name)
{
int r, g, b;
{
int r, g, b;