Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 3296)
+++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 3297)
@@ -376,4 +376,5 @@
*/
public static void loadPlugin(Window parent, PluginInformation plugin, ClassLoader pluginClassLoader) {
+ String msg = tr("Could not load plugin {0}. Delete from preferences?", plugin.name);
try {
Class klass = plugin.loadClass(pluginClassLoader);
@@ -382,20 +383,16 @@
pluginList.add(plugin.load(klass));
}
+ msg = null;
} catch(PluginException e) {
e.printStackTrace();
if (e.getCause() instanceof ClassNotFoundException) {
- String msg = tr("Could not load plugin {0} because the plugin
main class ''{1}'' was not found.
"
+ msg = tr("Could not load plugin {0} because the plugin
main class ''{1}'' was not found.
"
+ "Delete from preferences?", plugin.name, plugin.className);
- if (confirmDisablePlugin(parent, msg, plugin.name)) {
- Main.pref.removeFromCollection("plugins", plugin.name);
- }
}
} catch (Throwable e) {
e.printStackTrace();
- String msg = tr("Could not load plugin {0}. Delete from preferences?", plugin.name);
- if (confirmDisablePlugin(parent, msg, plugin.name)) {
- Main.pref.removeFromCollection("plugins", plugin.name);
- }
- }
+ }
+ if(msg != null && confirmDisablePlugin(parent, msg, plugin.name))
+ Main.pref.removeFromCollection("plugins", plugin.name);
}
@@ -910,14 +907,14 @@
public static String getBugReportText() {
String text = "";
- String pl = Main.pref.getCollectionAsString("plugins");
- if (pl != null && pl.length() != 0) {
- text += "Plugins: " + pl + "\n";
- }
+ LinkedList pl = new LinkedList(Main.pref.getCollection("plugins", new LinkedList()));
for (final PluginProxy pp : pluginList) {
- text += "Plugin " + pp.getPluginInformation().name;
- String version = pp.getPluginInformation().localversion;
- text += version != null && !version.equals("") ? " (Version: " + version + ")\n"
- : "\n";
- }
+ PluginInformation pi = pp.getPluginInformation();
+ pl.remove(pi.name);
+ pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("")
+ ? pi.localversion : "unknown") + ")");
+ }
+ Collections.sort(pl);
+ for (String s : pl)
+ text += "Plugin: " + s + "\n";
return text;
}