Changeset 28017 in osm for applications/editors/josm
- Timestamp:
- 2012-03-09T00:50:20+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/build.xml
r28000 r28017 28 28 <property name="commit.message" value="Commit message"/> 29 29 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 30 <property name="plugin.main.version" value="50 40"/>30 <property name="plugin.main.version" value="5056"/> 31 31 <!-- should not be necessary to change the following properties --> 32 32 <property name="josm" location="../../core/dist/josm-custom.jar"/> -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java
r28000 r28017 65 65 66 66 @Override public Icon getBaseIcon() { 67 return new ImageProvider(handler != null ? handler.getDataLayerIconName() : ICON_CORE_16). get(ModuleHandler.getResourceClassLoaders());67 return new ImageProvider(handler != null ? handler.getDataLayerIconName() : ICON_CORE_16).setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()).get(); 68 68 } 69 69 -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java
r28000 r28017 157 157 } 158 158 159 private static final ImageIcon extractIcon(String iconPath, File jarFile, boolean warn) {160 return new ImageProvider(iconPath).setArchive(jarFile).setMaxWidth(24).setMaxHeight(24).setOptional(true). get(warn);159 private static final ImageIcon extractIcon(String iconPath, File jarFile, boolean suppressWarnings) { 160 return new ImageProvider(iconPath).setArchive(jarFile).setMaxWidth(24).setMaxHeight(24).setOptional(true).setSuppressWarnings(suppressWarnings).get(); 161 161 } 162 162 … … 193 193 if (iconPath != null && file != null) { 194 194 // extract icon from the module jar file 195 icon = extractIcon(iconPath, file, false);195 icon = extractIcon(iconPath, file, true); 196 196 // if not found, extract icon from the plugin jar file 197 197 if (icon == null) {
Note:
See TracChangeset
for help on using the changeset viewer.