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

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/plugins

Files:

• PluginHandler.java (modified) (1 diff)
• PluginInformation.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -1167 +1167 @@
             GuiHelper.runInEDT(task);
             return task.get();
-        } catch (InterruptedException e) {
-            Main.warn(e);
-        } catch (ExecutionException e) {
+        } catch (InterruptedException | ExecutionException e) {
             Main.warn(e);
         }

trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -320 +320 @@
             Object plugin = c.newInstance(this);
             return new PluginProxy(plugin, this);
-        } catch(NoSuchMethodException e) {
-            throw new PluginException(name, e);
-        } catch(IllegalAccessException e) {
-            throw new PluginException(name, e);
-        } catch (InstantiationException e) {
-            throw new PluginException(name, e);
-        } catch(InvocationTargetException e) {
+        } catch(NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
             throw new PluginException(name, e);
         }
@@ -343 +337 @@
         try {
             return Class.forName(className, true, classLoader);
-        } catch (ClassNotFoundException e) {
-            throw new PluginException(name, e);
-        } catch (ClassCastException e) {
+        } catch (ClassNotFoundException | ClassCastException e) {
             throw new PluginException(name, e);
         }