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

Timestamp:

2015-10-27T14:47:00+01:00 (8 years ago)

Author:

Don-vip

Message:

better detection of plugin loading failures for unit test

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginProxy.java (modified) (5 diffs)

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

@@ -19 +19 @@
 public class PluginProxy extends Plugin {
 
+    /**
+     * The plugin.
+     */
     public final Object plugin;
 
+    /**
+     * Constructs a new {@code PluginProxy}.
+     * @param plugin the plugin
+     * @param info the associated plugin info
+     */
     public PluginProxy(Object plugin, PluginInformation info) {
         super(info);
@@ -26 +34 @@
     }
 
-    @Override public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+    private void handlePluginException(Exception e) {
+        PluginHandler.pluginLoadingExceptions.put(getPluginInformation().name, e);
+        BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
+    }
+
+    @Override
+    public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         try {
             plugin.getClass().getMethod("mapFrameInitialized", MapFrame.class, MapFrame.class).invoke(plugin, oldFrame, newFrame);
@@ -32 +46 @@
             Main.debug("Plugin "+plugin+" does not define mapFrameInitialized");
         } catch (Exception e) {
-            BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
+            handlePluginException(e);
         }
     }
 
-    @Override public PreferenceSetting getPreferenceSetting() {
+    @Override
+    public PreferenceSetting getPreferenceSetting() {
         try {
             return (PreferenceSetting) plugin.getClass().getMethod("getPreferenceSetting").invoke(plugin);
@@ -43 +58 @@
             return null;
         } catch (Exception e) {
-            BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
+            handlePluginException(e);
         }
         return null;
     }
 
-    @Override public void addDownloadSelection(List<DownloadSelection> list) {
+    @Override
+    public void addDownloadSelection(List<DownloadSelection> list) {
         try {
             plugin.getClass().getMethod("addDownloadSelection", List.class).invoke(plugin, list);
@@ -54 +70 @@
             Main.debug("Plugin "+plugin+" does not define addDownloadSelection");
         } catch (Exception e) {
-            BugReportExceptionHandler.handleException(new PluginException(this, getPluginInformation().name, e));
+            handlePluginException(e);
         }
     }