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

Timestamp:

2006-11-24T15:52:34+01:00 (17 years ago)

Author:

imi

Message:

• removed external tools (superseeded by plugins)
• added align-in-line mode
• added delete_if_empty-attribute to annotation presets
• fixed exception when help is not available

File:

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

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

@@ -6 +6 @@
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -25 +27 @@
         public final boolean early;
         public final String author;
+        public final List<URL> libraries = new ArrayList<URL>();
 
         public final Map<String, String> attr = new TreeMap<String, String>();
 
+        /**
+         * @param file the plugin jar file.
+         */
         public PluginInformation(File file) {
                 this.file = file;
@@ -39 +45 @@
                         early = Boolean.parseBoolean(attr.getValue("Plugin-Early"));
                         author = attr.getValue("Author");
+                        libraries.add(new URL(getURLString(file.getAbsolutePath())));
+                        String classPath = attr.getValue("Class-Path");
+                        if (classPath != null) {
+                                for (String s : classPath.split(classPath.contains(";") ? ";" : ":")) {
+                                        if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.:"))
+                                                s = file.getParent() + File.separator + s;
+                                        libraries.add(new URL(getURLString(s)));
+                                }
+                        }
+
                         for (Object o : attr.keySet())
                                 this.attr.put(o.toString(), attr.getValue(o.toString()));
@@ -63 +79 @@
         public Class<?> loadClass() {
                 try {
-                        ClassLoader loader = URLClassLoader.newInstance(
-                                        new URL[]{new URL(getURLString())},
-                                        getClass().getClassLoader());
+                        URL[] urls = new URL[libraries.size()];
+                        urls = libraries.toArray(urls);
+                        ClassLoader loader = URLClassLoader.newInstance(urls, getClass().getClassLoader());
                         Class<?> realClass = Class.forName(className, true, loader);
                         return realClass;
@@ -73 +89 @@
         }
 
-        private String getURLString() {
+        private String getURLString(String fileName) {
                 if (System.getProperty("os.name").startsWith("Windows"))
-                        return "file:/"+file.getAbsolutePath();
-                return "file://"+file.getAbsolutePath();
+                        return "file:/"+fileName;
+                return "file://"+fileName;
         }
 }