X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FUserColourScheme.java;h=9ae14cac7145a2897e3ced7a7b226fa8b0ea301f;hb=8fea25daa8f1f1cc564497ddf4e3c9e15a64596c;hp=b1e4d589f2ad671bbb68559ed50544f34aca5643;hpb=26ba864a6c290121fe6cf616794d2d0bea65fb7d;p=jalview.git diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java index b1e4d58..9ae14ca 100755 --- 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) { + 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;