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

Timestamp:

2008-08-28T22:07:04+02:00 (16 years ago)

Author:

stoecker

Message:

added multi-style mappaint support. Closes #1186

File:

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

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

@@ -12 +12 @@
                 if (html.length() > 0 && html.charAt(0) == '#')
                         html = html.substring(1);
-                if (html.length() != 6)
+                else if (html.length() != 6 && html.length() != 8)
                         return null;
                 try {
@@ -18 +18 @@
                                         Integer.parseInt(html.substring(0,2),16),
                                         Integer.parseInt(html.substring(2,4),16),
-                                        Integer.parseInt(html.substring(4,6),16));
+                                        Integer.parseInt(html.substring(4,6),16),
+                                        (html.length() == 8 ? Integer.parseInt(html.substring(6,8),16) : 255));
                 } catch (NumberFormatException e) {
                         return null;