Changeset 33617 in osm for applications

Timestamp:

2017-09-16T22:12:53+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12870

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="12828"/>
+    <property name="plugin.main.version" value="12870"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -46 +46 @@
 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation;
 import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -60 +61 @@
     public OdPlugin(PluginInformation info) {
         super(info);
+        ImageProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());
         if (instance == null) {
             instance = this;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java

@@ -72 +72 @@
         try {
             sources.add(ClassLoader.getSystemClassLoader());
-            sources.add(org.openstreetmap.josm.gui.MainApplication.class.getClassLoader());
+            sources.add(ModuleHandler.class.getClassLoader());
         } catch (SecurityException ex) {
             sources.add(ImageProvider.class.getClassLoader());
@@ -285 +285 @@
             ClassLoader moduleClassLoader = createClassLoader(toLoad);
             sources.add(0, moduleClassLoader);
+            ImageProvider.addAdditionalClassLoader(moduleClassLoader);
             monitor.setTicksCount(toLoad.size());
             for (ModuleInformation info : toLoad) {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
@@ -68 +67 @@
 
     public static final ImageProvider getImageProvider(String iconName, boolean optional) {
-        return new ImageProvider(iconName).setOptional(optional).setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());
+        return new ImageProvider(iconName).setOptional(optional);
     }