eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-07 12:51:02 +00:00
Code Activity

Merge remote-tracking branch 'server/bug3549' into bug3549

Browse Source
This commit is contained in:
Axel Uhl committed 2016-04-05 13:36:57 +02:00
2 parents f1e26013cf 933634b432
commit 6e77951ec6
2 files changed
+15 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.common.test/src/com/sap/sse/common/impl/test/AbstractColorTest.java
+4 -4
View File
@@ -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);
}
java/com.sap.sse.common/src/com/sap/sse/common/impl/AbstractColor.java
+11 -9
View File
@@ -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) {