X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fgraphics%2FColor.java;h=dce2a8d8828e70a6526772da0ed046e4968f86cf;hp=210aadebe0383808bb148dafc62f044dc1ab77e8;hb=76b21655a0710caf4f972c107a3ab991032d7e10;hpb=8e190fb0ff508ccf4962bbfbf8295a431805c12b diff --git a/src/org/ibex/graphics/Color.java b/src/org/ibex/graphics/Color.java index 210aade..dce2a8d 100644 --- a/src/org/ibex/graphics/Color.java +++ b/src/org/ibex/graphics/Color.java @@ -1,4 +1,7 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2000-2005 the Contributors, as shown in the revision logs. +// Licensed under the GNU General Public License version 2 ("the License"). +// You may not use this file except in compliance with the License. + package org.ibex.graphics; import java.util.*; import org.ibex.util.*; @@ -8,7 +11,7 @@ public class Color { public static int stringToColor(String s) { // FIXME support three-char strings by doubling digits if (s == null) return 0x00000000; - else if (standard.get(s) != null) return 0xFF000000 | org.ibex.js.JS.toInt(standard.get(s)); + else if (standard.get(s) != null) return 0xFF000000 | ((Integer)standard.get(s)).intValue(); else if (s.length() == 7 && s.charAt(0) == '#') try { // FEATURE alpha return 0xFF000000 |