|
33 | 33 | public class RGBA extends RGB { |
34 | 34 | static final String functionname = "rgba"; |
35 | 35 |
|
36 | | - public static final CssIdent r, g, b, a; |
| 36 | + public static final CssIdent[] colorRelativeValues; |
37 | 37 |
|
38 | 38 | static { |
39 | | - r = CssIdent.getIdent("r"); |
40 | | - g = CssIdent.getIdent("g"); |
41 | | - b = CssIdent.getIdent("b"); |
42 | | - a = CssIdent.getIdent("alpha"); |
| 39 | + String[] _allowed_values = {"r", "g", "b", "alpha"}; |
| 40 | + colorRelativeValues = new CssIdent[_allowed_values.length]; |
| 41 | + int i = 0; |
| 42 | + for (String s : _allowed_values) { |
| 43 | + colorRelativeValues[i++] = CssIdent.getIdent(s); |
| 44 | + } |
43 | 45 | } |
44 | 46 |
|
| 47 | + public static boolean isColorRelativeValue(CssIdent ident) { |
| 48 | + for (CssIdent id : colorRelativeValues) { |
| 49 | + if (id.equals(ident)) { |
| 50 | + return true; |
| 51 | + } |
| 52 | + } |
| 53 | + return false; |
| 54 | + } |
| 55 | + |
45 | 56 | private String output = null; |
46 | 57 | String fname; |
47 | 58 |
|
@@ -263,7 +274,7 @@ public static RGBA parseModernRGBA(ApplContext ac, CssExpression exp, CssColor c |
263 | 274 | break; |
264 | 275 | case CssTypes.CSS_IDENT: |
265 | 276 | if ((CssColor.none.equals(val.getIdent()) && rgba.isModernCss) || |
266 | | - (rgba.isRelative && r.equals(val.getIdent()))) { |
| 277 | + (rgba.isRelative && isColorRelativeValue(val.getIdent()))) { |
267 | 278 | rgba.setRed(ac, val); |
268 | 279 | break; |
269 | 280 | } |
@@ -301,7 +312,7 @@ public static RGBA parseModernRGBA(ApplContext ac, CssExpression exp, CssColor c |
301 | 312 | break; |
302 | 313 | case CssTypes.CSS_IDENT: |
303 | 314 | if ((CssColor.none.equals(val.getIdent()) && rgba.isModernCss) || |
304 | | - (rgba.isRelative && g.equals(val.getIdent()))) { |
| 315 | + (rgba.isRelative && isColorRelativeValue(val.getIdent()))) { |
305 | 316 | rgba.setGreen(ac, val); |
306 | 317 | break; |
307 | 318 | } |
@@ -338,7 +349,7 @@ public static RGBA parseModernRGBA(ApplContext ac, CssExpression exp, CssColor c |
338 | 349 | break; |
339 | 350 | case CssTypes.CSS_IDENT: |
340 | 351 | if ((CssColor.none.equals(val.getIdent()) && rgba.isModernCss) || |
341 | | - (rgba.isRelative && b.equals(val.getIdent()))) { |
| 352 | + (rgba.isRelative && isColorRelativeValue(val.getIdent()))) { |
342 | 353 | rgba.setBlue(ac, val); |
343 | 354 | break; |
344 | 355 | } |
@@ -382,7 +393,7 @@ public static RGBA parseModernRGBA(ApplContext ac, CssExpression exp, CssColor c |
382 | 393 | break; |
383 | 394 | case CssTypes.CSS_IDENT: |
384 | 395 | if ((CssColor.none.equals(val.getIdent()) && rgba.isModernCss) || |
385 | | - (rgba.isRelative && a.equals(val.getIdent()))) { |
| 396 | + (rgba.isRelative && isColorRelativeValue(val.getIdent()))) { |
386 | 397 | rgba.setAlpha(ac, val); |
387 | 398 | break; |
388 | 399 | } |
|
0 commit comments