Changeset 14474 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-12-01T15:08:32+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17021 - simplify exception handling

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

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

@@ -446 +446 @@
                     closeSourceInputStream(in);
                 }
-            } catch (IOException e) {
+            } catch (IOException | IllegalArgumentException e) {
                 Logging.warn(tr("Failed to load Mappaint styles from ''{0}''. Exception was: {1}", url, e.toString()));
                 Logging.log(Logging.LEVEL_ERROR, e);
@@ -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) {