Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java	(revision 12218)
@@ -305,9 +305,9 @@
             Constructor<?> c = activeRenderer.getConstructor(new Class<?>[]{Graphics2D.class, NavigatableComponent.class, boolean.class});
             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
-        } catch (NoSuchMethodException | IllegalArgumentException | InstantiationException | IllegalAccessException e) {
-            throw new MapRendererFactoryException(e);
         } catch (InvocationTargetException e) {
             Main.debug(e);
             throw new MapRendererFactoryException(e.getCause());
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
+            throw new MapRendererFactoryException(e);
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 12218)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
@@ -824,5 +823,5 @@
             try {
                 return not ^ (Boolean) method.invoke(null, e);
-            } catch (IllegalAccessException | InvocationTargetException ex) {
+            } catch (ReflectiveOperationException ex) {
                 throw new JosmRuntimeException(ex);
             }
Index: trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java	(revision 12218)
@@ -67,6 +67,5 @@
                 setPropertiesFromAttributes();
             }
-        } catch (IllegalArgumentException | IllegalAccessException |
-                InvocationTargetException | NoSuchMethodException | SecurityException e) {
+        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
            Main.error(e);
        }
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 12218)
@@ -9,5 +9,4 @@
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -325,5 +324,5 @@
             Object plugin = c.newInstance(this);
             return new PluginProxy(plugin, this);
-        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
             throw new PluginException(name, e);
         }
Index: trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java	(revision 12218)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.plugins;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
@@ -47,5 +46,5 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -60,5 +59,5 @@
             Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -73,5 +72,5 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java	(revision 12218)
@@ -295,5 +295,5 @@
               .append(getReleaseId()).append(" (")
               .append(getCurrentBuild()).append(')');
-        } catch (IllegalAccessException | InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
             Main.error(e);
         }
Index: trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 12217)
+++ trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 12218)
@@ -8,5 +8,4 @@
 import java.io.Reader;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -157,5 +156,5 @@
                     }
                 }
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            } catch (ReflectiveOperationException | IllegalArgumentException e) {
                 Main.error(e); // SAXException does not dump inner exceptions.
                 throwException(e);