Changeset 6663 in josm

Timestamp:

2014-01-10T18:03:03+01:00 (11 years ago)

Author:

simon04

Message:

fix #9551 - MapCSS: fix font-weight: bold

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -155 +155 @@
 
     protected static Font getFont(Cascade c) {
-        initDefaultFontParameters(); // populated cached preferences, if necesary
+        initDefaultFontParameters(); // populated cached preferences, if necessary
         String name = c.get("font-family", DEFAULT_FONT_NAME, String.class);
         float size = c.get("font-size", DEFAULT_FONT_SIZE, Float.class);
         int weight = Font.PLAIN;
-        Keyword weightKW = c.get("font-weight", null, Keyword.class);
-        if (weightKW != null && equal(weightKW, "bold")) {
+        if ("bold".equalsIgnoreCase(c.get("font-weight", null, String.class))) {
             weight = Font.BOLD;
         }
         int style = Font.PLAIN;
-        Keyword styleKW = c.get("font-style", null, Keyword.class);
-        if (styleKW != null && equal(styleKW.val, "italic")) {
+        if ("italic".equalsIgnoreCase(c.get("font-style", null, String.class))) {
             style = Font.ITALIC;
         }