Changeset 14466 in josm for trunk

Timestamp:

2018-11-29T08:09:55+01:00 (5 years ago)

Author:

GerdP

Message:

see #17021 : fix unit test failure

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• MapCSSStyleSource.java (modified) (1 diff)
• Selector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -458 +458 @@
                 Logging.error(e);
                 logError(new ParseException(e.getMessage())); // allow e to be garbage collected, it links to the entire token stream
+            } catch (IllegalArgumentException e1) {
+                final RuntimeException e = new JosmRuntimeException(e1.getMessage());
+                Logging.warn(tr("Failed to parse Mappaint styles from ''{0}''. Error was: {1}", url, e.getMessage()));
+                Logging.error(e);
+                logError(e);
+
             }
             if (metadataOnly) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
@@ -654 +655 @@
             case "setting": return BASE_SETTING;
             default:
-                throw new IllegalArgumentException("unknown selector " + base);
+                throw new IllegalArgumentException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
             }
         }