Index: src/org/openstreetmap/josm/Main.java =================================================================== --- src/org/openstreetmap/josm/Main.java (revision 266) +++ src/org/openstreetmap/josm/Main.java (revision 267) @@ -234,20 +234,16 @@ // iterate all plugins and collect all libraries of all plugins: List allPluginLibraries = new ArrayList(); - for (Collection c : p.values()) { - for (PluginInformation info : c) { - allPluginLibraries.addAll(info.getLibraries()); - } - } + for (Collection c : p.values()) + for (PluginInformation info : c) + allPluginLibraries.addAll(info.libraries); // create a classloader for all plugins: URL[] jarUrls = new URL[allPluginLibraries.size()]; jarUrls = allPluginLibraries.toArray(jarUrls); URLClassLoader pluginClassLoader = new URLClassLoader(jarUrls, Main.class.getClassLoader()); - - + for (Collection c : p.values()) { for (PluginInformation info : c) { try { - info.setClassLoader(pluginClassLoader); // set the common classloader - Class klass = info.loadClass(); + Class klass = info.loadClass(pluginClassLoader); ImageProvider.sources.add(0, klass); System.out.println("loading "+info.name); Index: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 266) +++ src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (revision 267) @@ -72,4 +72,5 @@ } }; + /** * Main table. 3 columns: @@ -80,5 +81,5 @@ private Map> cache = new HashMap>(); - private JLabel notLoaded = new JLabel("

"+tr("Click Reload to refresh list")+"

"); + private JLabel notLoaded = new JLabel(""+tr("Click Reload to refresh list")+""); private JButton reloadButton = new JButton(tr("Reload"), ImageProvider.get("dialogs/refresh")); private JButton revertButton = new JButton(tr("Revert"), ImageProvider.get("dialogs/revert")); @@ -88,4 +89,5 @@ historyPane.setVisible(false); notLoaded.setVisible(true); + notLoaded.setHorizontalAlignment(JLabel.CENTER); history.setDefaultRenderer(Object.class, new DefaultTableCellRenderer(){ @@ -131,4 +133,5 @@ reloadButton.setToolTipText(tr("Reload all currently selected objects and refresh the list.")); reloadButton.putClientProperty("help", "Dialog/History/Reload"); + revertButton.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { Index: src/org/openstreetmap/josm/plugins/Plugin.java =================================================================== --- src/org/openstreetmap/josm/plugins/Plugin.java (revision 266) +++ src/org/openstreetmap/josm/plugins/Plugin.java (revision 267) @@ -40,25 +40,31 @@ public abstract class Plugin { - private String name; + String name; public Plugin() { - URL[] urls = ((URLClassLoader)getClass().getClassLoader()).getURLs(); - name = urls[urls.length-1].toString(); - if (name.toLowerCase().endsWith(".jar")) { - int lastSlash = name.lastIndexOf('/'); - name = name.substring(lastSlash+1, name.length()-4); - } + try { + URL[] urls = ((URLClassLoader)getClass().getClassLoader()).getURLs(); + name = urls[urls.length-1].toString(); + if (name.toLowerCase().endsWith(".jar")) { + int lastSlash = name.lastIndexOf('/'); + name = name.substring(lastSlash+1, name.length()-4); + } + } catch (RuntimeException e) { + name = "unknown"; + } } /** * @return The name of this plugin. This is the name of the .jar file. + * @deprecated Plugins have to know their name by themself. */ - public final String getName() { + @Deprecated public final String getName() { return name; } /** * @return The directory for the plugin to store all kind of stuff. + * @deprecated Use Main.pref.getPreferencesDir()+"plugins/"+name+"/"; instead. */ - public final String getPluginDir() { + @Deprecated public final String getPluginDir() { return Main.pref.getPreferencesDir()+"plugins/"+name+"/"; } Index: src/org/openstreetmap/josm/plugins/PluginException.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginException.java (revision 266) +++ src/org/openstreetmap/josm/plugins/PluginException.java (revision 267) @@ -11,6 +11,6 @@ */ public class PluginException extends RuntimeException { - private final PluginProxy plugin; - private final String name; + public final PluginProxy plugin; + public final String name; public PluginException(PluginProxy plugin, String name, Throwable cause) { @@ -19,10 +19,3 @@ this.name = name; } - - public PluginProxy getPlugin() { - return plugin; - } - public String getName() { - return name; - } } Index: src/org/openstreetmap/josm/plugins/PluginInformation.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 266) +++ src/org/openstreetmap/josm/plugins/PluginInformation.java (revision 267) @@ -6,5 +6,4 @@ import java.io.InputStream; import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collection; @@ -33,6 +32,5 @@ public final String author; public final int stage; - protected final List libraries = new ArrayList(); - protected ClassLoader classLoader; + public final List libraries = new ArrayList(); public final Map attr = new TreeMap(); @@ -82,5 +80,5 @@ s = entry.toString(); entry = new StringBuilder(); - if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.\\:")) + if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.\\:") && file != null) s = file.getParent() + File.separator + s; libraries.add(new URL(getURLString(s))); @@ -111,7 +109,7 @@ * Load the class of the plugin */ - public Class loadClass() { + public Class loadClass(ClassLoader classLoader) { try { - Class realClass = Class.forName(className, true, getClassLoader()); + Class realClass = Class.forName(className, true, classLoader); return realClass; } catch (Exception e) { @@ -126,33 +124,4 @@ } - /** - * Returns all libraries the plugin needs (the plugin's jar file itself and all jars declared - * in the manifest's Class-Path section). - * @return the libraries a list of URLs to the libraries. - */ - public List getLibraries() { - return libraries; - } - - /** - * @return the classLoader - */ - public ClassLoader getClassLoader() { - // if I have no classloader set, create one for me and my libraries: - if(classLoader == null) { - URL[] urls = new URL[libraries.size()]; - urls = libraries.toArray(urls); - classLoader = URLClassLoader.newInstance(urls, getClass().getClassLoader()); - } - return classLoader; - } - - /** - * @param classLoader the classLoader to set - */ - public void setClassLoader(ClassLoader classLoader) { - this.classLoader = classLoader; - } - /** * Try to find a plugin after some criterias. Extract the plugin-information Index: src/org/openstreetmap/josm/plugins/PluginProxy.java =================================================================== --- src/org/openstreetmap/josm/plugins/PluginProxy.java (revision 266) +++ src/org/openstreetmap/josm/plugins/PluginProxy.java (revision 267) @@ -24,4 +24,15 @@ this.plugin = plugin; this.info = info; + + // setting name of the plugin by reflection + if (plugin instanceof Plugin) { + try { + Plugin.class.getDeclaredField("name").set(plugin, info.name); + } catch (Exception e) { + if (e instanceof RuntimeException) + throw (RuntimeException)e; + throw new RuntimeException(e); + } + } } Index: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 266) +++ src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 267) @@ -43,5 +43,5 @@ // Check for an explicit problem when calling a plugin function if (e instanceof PluginException) { - PluginProxy plugin = ((PluginException)e).getPlugin(); + PluginProxy plugin = ((PluginException)e).plugin; if (plugin != null && !plugin.misbehaving) { JOptionPane.showMessageDialog(Main.parent, tr("The plugin {0} throwed an exception: {1}\nIt may be outdated. Please contact the plugin's autor.\nThis message will not shown again until JOSM is restarted.", plugin.info.name, e.getMessage()));