Changeset 7004 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2014-04-26T15:28:16+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use multi-catch where applicable

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• ServerSidePreferences.java (modified) (1 diff)
• osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• projection/proj/ClassProjFactory.java (modified) (1 diff)
• validation/tests/OpeningHourTest.java (modified) (1 diff)
• validation/tests/TagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1167 +1167 @@
         try {
             structPrototype = klass.newInstance();
-        } catch (InstantiationException ex) {
-            throw new RuntimeException(ex);
-        } catch (IllegalAccessException ex) {
+        } catch (InstantiationException | IllegalAccessException ex) {
             throw new RuntimeException(ex);
         }
@@ -1187 +1185 @@
                     }
                 }
-            } catch (IllegalArgumentException ex) {
-                throw new RuntimeException(ex);
-            } catch (IllegalAccessException ex) {
+            } catch (IllegalArgumentException | IllegalAccessException ex) {
                 throw new RuntimeException(ex);
             }
@@ -1200 +1196 @@
         try {
             struct = klass.newInstance();
-        } catch (InstantiationException ex) {
-            throw new RuntimeException(ex);
-        } catch (IllegalAccessException ex) {
+        } catch (InstantiationException | IllegalAccessException ex) {
             throw new RuntimeException(ex);
         }

trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -175 +175 @@
         try {
             fromXML(in);
-        } catch (RuntimeException e) {
-            Main.error(e);
-        } catch (XMLStreamException e) {
+        } catch (RuntimeException | XMLStreamException e) {
             Main.error(e);
         }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -268 +268 @@
             Constructor<?> c = activeRenderer.getConstructor(new Class<?>[]{Graphics2D.class, NavigatableComponent.class, boolean.class});
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
-        } catch(NoSuchMethodException e){
-            throw new MapRendererFactoryException(e);
-        } catch (IllegalArgumentException e) {
-            throw new MapRendererFactoryException(e);
-        } catch (InstantiationException e) {
-            throw new MapRendererFactoryException(e);
-        } catch (IllegalAccessException e) {
+        } catch(NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException e){
             throw new MapRendererFactoryException(e);
         } catch (InvocationTargetException e) {

trunk/src/org/openstreetmap/josm/data/projection/proj/ClassProjFactory.java

@@ -18 +18 @@
         try {
             proj = projClass.newInstance();
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             throw new RuntimeException(e);
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -209 +209 @@
                 errors.add(new OpeningHoursTestError(tr("opening_hours value can be prettified"), Severity.OTHER, prettifiedValue));
             }
-        } catch (ScriptException ex) {
-            Main.error(ex);
-        } catch (NoSuchMethodException ex) {
+        } catch (ScriptException | NoSuchMethodException ex) {
             Main.error(ex);
         }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -714 +714 @@
                 } catch (IllegalStateException e) {
                     return tr("Illegal expression ''{0}''", exp);
-                }
-                catch (PatternSyntaxException e) {
+                } catch (PatternSyntaxException e) {
                     return tr("Illegal regular expression ''{0}''", exp);
                 }