diff --git a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java index 65b20a8544d..44eea26a2e4 100644 --- a/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java +++ b/java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java @@ -42,9 +42,9 @@ public class AbstractColorTest { @Test public void testHSL() throws Exception { Color color = AbstractColor.getCssColor("hsl(360, 100%, 100%)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assert.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("HSL(360, 1.0, 1.0)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assert.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("hsl(360, 1.0, 1.0,435,789)"); Assert.assertEquals(null, color); } @@ -52,9 +52,9 @@ public class AbstractColorTest { @Test public void testHSLA() throws Exception { Color color = AbstractColor.getCssColor("hsla(360, 100%, 100%,hjhb)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assert.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("HSLa(360, 1.0, 1.0,0.4)"); - Assert.assertEquals("#FFFFFF", color.getAsHtml()); + Assert.assertEquals("#FF00FF", color.getAsHtml()); color = AbstractColor.getCssColor("hsla(360, 1.0, 1.0,435,789)"); Assert.assertEquals(null, color); } diff --git a/java/com.sap.sse.common/src/com/sap/sse/common/impl/AbstractColor.java b/java/com.sap.sse.common/src/com/sap/sse/common/impl/AbstractColor.java index f9cc1986938..323d2cff3d2 100755 --- a/java/com.sap.sse.common/src/com/sap/sse/common/impl/AbstractColor.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/impl/AbstractColor.java @@ -25,15 +25,17 @@ public abstract class AbstractColor implements Color { * accepts all colors in the css-format (see http://www.w3schools.com/cssref/css_colors_legal.asp) */ public static Color getCssColor(String color) { - String[] colorWithName = color.split("[()]"); - switch (colorWithName[0].trim().toLowerCase()) { - case "rgb": - case "rgba": - return getRGBColor(colorWithName[1]); - case "hsl": - case "hsla": - case "hsv": - return getHSVColor(colorWithName[1]); + String[] colorWithName = color.trim().split("[()]"); + if (colorWithName.length == 2) { + switch (colorWithName[0].trim().toLowerCase()) { + case "rgb": + case "rgba": + return getRGBColor(colorWithName[1]); + case "hsl": + case "hsla": + case "hsv": + return getHSVColor(colorWithName[1]); + } } Color resultColor = getColorByLowercaseNameStatic(color.toLowerCase().replace(" ", "")); if (resultColor == null) {