Skip to content

Commit 3d9b4c7

Browse files
committed
Adapt to color handling change in core.
1 parent b15c223 commit 3d9b4c7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

junit/io/sf/carte/doc/style/css/awt/AWTHelperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testGetAWTColor() throws CSSPropertyValueException {
4242
CSSValue cssColor = style.getPropertyCSSValue("color");
4343
assertNotNull(cssColor);
4444
assertEquals(CssType.TYPED, cssColor.getCssValueType());
45-
assertEquals(CSSValue.Type.RGBCOLOR, ((CSSTypedValue) cssColor).getPrimitiveType());
45+
assertEquals(CSSValue.Type.COLOR, ((CSSTypedValue) cssColor).getPrimitiveType());
4646
Color color = AWTHelper.getAWTColor((CSSTypedValue) cssColor);
4747
assertNotNull(color);
4848
assertEquals(8, color.getRed());
@@ -54,7 +54,7 @@ public void testGetAWTColor() throws CSSPropertyValueException {
5454
cssColor = style.getPropertyCSSValue("color");
5555
assertNotNull(cssColor);
5656
assertEquals(CssType.TYPED, cssColor.getCssValueType());
57-
assertEquals(CSSValue.Type.RGBCOLOR, ((CSSTypedValue) cssColor).getPrimitiveType());
57+
assertEquals(CSSValue.Type.COLOR, ((CSSTypedValue) cssColor).getPrimitiveType());
5858
color = AWTHelper.getAWTColor((CSSTypedValue) cssColor);
5959
assertNotNull(color);
6060
assertEquals(255, color.getRed());

src/io/sf/carte/doc/style/css/awt/AWTHelper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ public static Color getAWTColor(CSSTypedValue cssColor) throws CSSPropertyValueE
9393
Color awtcolor = null;
9494
if (cssColor != null) {
9595
switch (cssColor.getPrimitiveType()) {
96-
case RGBCOLOR:
97-
RGBAColor color = cssColor.getRGBColorValue();
96+
case COLOR:
97+
RGBAColor color = cssColor.toRGBColorValue();
9898
CSSPrimitiveValue red = color.getRed();
9999
CSSPrimitiveValue green = color.getGreen();
100100
CSSPrimitiveValue blue = color.getBlue();

0 commit comments

Comments
 (0)