Changeset 33617 in osm for applications/editors
- Timestamp:
- 2017-09-16T22:12:53+02:00 (7 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/build.xml
r33611 r33617 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <project name="opendata" default="dist" basedir="."> 3 <property name="plugin.main.version" value="128 28"/>3 <property name="plugin.main.version" value="12870"/> 4 4 <property name="plugin.author" value="Don-vip"/> 5 5 <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/> -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
r33613 r33617 46 46 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation; 47 47 import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils; 48 import org.openstreetmap.josm.tools.ImageProvider; 48 49 import org.openstreetmap.josm.tools.Pair; 49 50 … … 60 61 public OdPlugin(PluginInformation info) { 61 62 super(info); 63 ImageProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()); 62 64 if (instance == null) { 63 65 instance = this; -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java
r33518 r33617 72 72 try { 73 73 sources.add(ClassLoader.getSystemClassLoader()); 74 sources.add( org.openstreetmap.josm.gui.MainApplication.class.getClassLoader());74 sources.add(ModuleHandler.class.getClassLoader()); 75 75 } catch (SecurityException ex) { 76 76 sources.add(ImageProvider.class.getClassLoader()); … … 285 285 ClassLoader moduleClassLoader = createClassLoader(toLoad); 286 286 sources.add(0, moduleClassLoader); 287 ImageProvider.addAdditionalClassLoader(moduleClassLoader); 287 288 monitor.setTicksCount(toLoad.size()); 288 289 for (ModuleInformation info : toLoad) { -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java
r32790 r33617 17 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 18 18 import org.openstreetmap.josm.data.osm.Relation; 19 import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleHandler;20 19 import org.openstreetmap.josm.tools.ImageProvider; 21 20 import org.openstreetmap.josm.tools.Utils; … … 68 67 69 68 public static final ImageProvider getImageProvider(String iconName, boolean optional) { 70 return new ImageProvider(iconName).setOptional(optional) .setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());69 return new ImageProvider(iconName).setOptional(optional); 71 70 } 72 71
Note:
See TracChangeset
for help on using the changeset viewer.