X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FUserColourScheme.java;h=9ae14cac7145a2897e3ced7a7b226fa8b0ea301f;hb=8bb1df31c9d46763d2a3278d27d52ce69ba441b3;hp=7aff05a26cd704eb8e759c8ffcae1c792f2c0317;hpb=9359a2279fcaa47910e31805b967390bffd6a573;p=jalview.git diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java index 7aff05a..9ae14ca 100755 --- a/src/jalview/schemes/UserColourScheme.java +++ b/src/jalview/schemes/UserColourScheme.java @@ -67,7 +67,7 @@ public class UserColourScheme extends ResidueColourScheme if (col == null) { - System.out.println("Unknown colour!! " + colour); + System.out.println("Making colour from name: " + colour); col = createColourFromName(colour); } @@ -101,6 +101,10 @@ public class UserColourScheme extends ResidueColourScheme public static Color getColourFromString(String colour) { + if (colour == null) + { + return 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;