Changeset 12218 in josm for trunk

Timestamp:

2017-05-20T17:22:34+02:00 (8 years ago)

Author:

Don-vip

Message:

code cleanup - catch ReflectiveOperationException when possible

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• gui/mappaint/mapcss/ConditionFactory.java (modified) (2 diffs)
• gui/widgets/JosmImageView.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (2 diffs)
• plugins/PluginProxy.java (modified) (4 diffs)
• tools/PlatformHookWindows.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (2 diffs)

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

@@ -305 +305 @@
             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);
         }
     }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
@@ -824 +823 @@
             try {
                 return not ^ (Boolean) method.invoke(null, e);
-            } catch (IllegalAccessException | InvocationTargetException ex) {
+            } catch (ReflectiveOperationException ex) {
                 throw new JosmRuntimeException(ex);
             }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java

@@ -67 +67 @@
                 setPropertiesFromAttributes();
             }
-        } catch (IllegalArgumentException | IllegalAccessException |
-                InvocationTargetException | NoSuchMethodException | SecurityException e) {
+        } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
            Main.error(e);
        }

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

@@ -9 +9 @@
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -325 +324 @@
             Object plugin = c.newInstance(this);
             return new PluginProxy(plugin, this);
-        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
             throw new PluginException(name, e);
         }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
@@ -47 +46 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -60 +59 @@
             Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -73 +72 @@
             Main.trace(e);
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
-        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
+        } catch (ReflectiveOperationException | IllegalArgumentException e) {
             handlePluginException(e);
         }

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -295 +295 @@
               .append(getReleaseId()).append(" (")
               .append(getCurrentBuild()).append(')');
-        } catch (IllegalAccessException | InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
             Main.error(e);
         }

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -8 +8 @@
 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 +156 @@
                     }
                 }
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+            } catch (ReflectiveOperationException | IllegalArgumentException e) {
                 Main.error(e); // SAXException does not dump inner exceptions.
                 throwException(e);