Changeset 267 in josm for src/org/openstreetmap/josm/Main.java

Timestamp:

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

Author:

imi

Message:

• added and fixed some tests

File:

• src/org/openstreetmap/josm/Main.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -234 +234 @@
                 // iterate all plugins and collect all libraries of all plugins:
                 List<URL> allPluginLibraries = new ArrayList<URL>();
-                for (Collection<PluginInformation> c : p.values()) {
-                        for (PluginInformation info : c) {
-                                allPluginLibraries.addAll(info.getLibraries());
-                        }
-                }
+                for (Collection<PluginInformation> 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<PluginInformation> 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);