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

Timestamp:

2016-05-15T00:51:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (4 diffs)
• PluginInformation.java (modified) (1 diff)
• PluginProxy.java (modified) (4 diffs)

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

@@ -15 +15 @@
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -723 +724 @@
                         + "Delete from preferences?</html>", plugin.name, plugin.className);
             }
-        }  catch (Exception e) {
+        }  catch (RuntimeException e) {
             pluginLoadingExceptions.put(plugin.name, e);
             Main.error(e);
@@ -1193 +1194 @@
                 // Check the plugin is a valid and accessible JAR file before installing it (fix #7754)
                 new JarFile(updatedPlugin).close();
-            } catch (Exception e) {
+            } catch (IOException e) {
                 if (dowarn) {
                     Main.warn(tr("Failed to install plugin ''{0}'' from temporary download file ''{1}''. {2}",
@@ -1221 +1222 @@
             try {
                 new JarFile(jar).close();
-            } catch (Exception e) {
+            } catch (IOException e) {
                 Main.warn(e);
                 return false;

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

@@ -273 +273 @@
                         }
                     }
-                } catch (Exception e) {
+                } catch (NumberFormatException e) {
                     Main.error(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;
 
@@ -45 +46 @@
         } catch (NoSuchMethodException e) {
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
-        } catch (Exception e) {
+        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -57 +58 @@
             Main.debug("Plugin "+plugin+" does not define getPreferenceSetting");
             return null;
-        } catch (Exception e) {
+        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
             handlePluginException(e);
         }
@@ -69 +70 @@
         } catch (NoSuchMethodException e) {
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
-        } catch (Exception e) {
+        } catch (InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
             handlePluginException(e);
         }