Changeset 267 in josm for src/org/openstreetmap/josm/plugins

Timestamp:

2007-06-30T22:01:02+02:00 (18 years ago)

Author:

imi

Message:

• added and fixed some tests

Location:

src/org/openstreetmap/josm/plugins

Files:

• Plugin.java (modified) (1 diff)
• PluginException.java (modified) (2 diffs)
• PluginInformation.java (modified) (5 diffs)
• PluginProxy.java (modified) (1 diff)
• test_manifest.mf (added)

src/org/openstreetmap/josm/plugins/Plugin.java

@@ -40 +40 @@
 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 <code>Main.pref.getPreferencesDir()+"plugins/"+name+"/";</code> instead.
          */
-        public final String getPluginDir() {
+        @Deprecated public final String getPluginDir() {
                 return Main.pref.getPreferencesDir()+"plugins/"+name+"/";
         }

src/org/openstreetmap/josm/plugins/PluginException.java

@@ -11 +11 @@
  */
 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 +19 @@
                 this.name = name;
     }
-        
-        public PluginProxy getPlugin() {
-                return plugin;
-        }
-        public String getName() {
-                return name;
-        }
 }

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

@@ -6 +6 @@
 import java.io.InputStream;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33 +32 @@
         public final String author;
         public final int stage;
-        protected final List<URL> libraries = new ArrayList<URL>();
-        protected ClassLoader classLoader;
+        public final List<URL> libraries = new ArrayList<URL>();
 
         public final Map<String, String> attr = new TreeMap<String, String>();
@@ -82 +80 @@
                                         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 +109 @@
          * 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 +124 @@
         }
 
-        /**
-         * 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<URL> 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

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

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