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

Timestamp:

2014-01-19T20:30:57+01:00 (10 years ago)

Author:

simon04

Message:

fix #9191 - MapCSS: Add option to include colour preferences of external styles

The syntax is the same as for the XML styles: name#123456

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ColorHelper.java (modified) (1 diff)
• Utils.java (modified) (1 diff)

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

@@ -21 +21 @@
         if (html.length() > 0 && html.charAt(0) == '#')
             html = html.substring(1);
+        if (html.length() == 3) {
+            return html2color(new String(
+                    new char[]{html.charAt(0), html.charAt(0), html.charAt(1), html.charAt(1), html.charAt(2), html.charAt(2)}));
+        }
         if (html.length() != 6 && html.length() != 8)
             return null;

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

@@ -630 +630 @@
 
     /**
-     * Convert Hex String to Color.
-     * @param s Must be of the form "#34a300" or "#3f2", otherwise throws Exception.
-     * Upper/lower case does not matter.
-     * @return The corresponding color.
-     */
-    static public Color hexToColor(String s) {
-        String clr = s.substring(1);
-        if (clr.length() == 3) {
-            clr = new String(new char[] {
-                clr.charAt(0), clr.charAt(0), clr.charAt(1), clr.charAt(1), clr.charAt(2), clr.charAt(2)
-            });
-        }
-        if (clr.length() != 6)
-            throw new IllegalArgumentException();
-        return new Color(Integer.parseInt(clr, 16));
-    }
-
-    /**
      * Opens a HTTP connection to the given URL and sets the User-Agent property to JOSM's one.
      * @param httpURL The HTTP url to open (must use http:// or https://)