Changeset 16319 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2020-04-17T15:01:21+02:00 (4 years ago)

Author:

simon04

Message:

see #8352 - PropertiesDialog: fix 3-char CSS color names such as "red"

File:

• trunk/src/org/openstreetmap/josm/tools/ColorHelper.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/ColorHelper.java

@@ -3 +3 @@
 
 import java.awt.Color;
-
-import org.openstreetmap.josm.gui.mappaint.mapcss.CSSColors;
 
 /**
@@ -16 +14 @@
 
     /**
-     * Returns the {@code Color} for the given HTML code, also evaluates CSS color names using {@link CSSColors}.
+     * Returns the {@code Color} for the given HTML code.
      * @param html the color code
      * @return the color
@@ -30 +28 @@
         }
         if (html.length() != 6 && html.length() != 8)
-            return CSSColors.get(html);
+            return null;
         try {
             return new Color(
@@ -38 +36 @@
                     html.length() == 8 ? Integer.parseInt(html.substring(6, 8), 16) : 255);
         } catch (NumberFormatException e) {
-            return CSSColors.get(html);
+            return null;
         }
     }