[Rails-commits] 18xx/rails/util Util.java,1.21,1.22

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/util
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5824/rails/util

Modified Files:
	Util.java 
Log Message:
Fixed parseColour() to catch empty or missing values

Index: Util.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/util/Util.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Util.java	28 Feb 2010 21:38:06 -0000	1.21
--- Util.java	16 May 2010 20:57:40 -0000	1.22
***************
*** 104,108 ****
      public static Color parseColour (String s) throws ConfigurationException{
          Color c = null;
!         if (s.indexOf(',') == -1) {
              // Assume hexadecimal RRGGBB
              try {
--- 104,109 ----
      public static Color parseColour (String s) throws ConfigurationException{
          Color c = null;
!         if (!Util.hasValue(s)) {
!         } else if (s.indexOf(',') == -1) {
              // Assume hexadecimal RRGGBB
              try {