Changeset 31116 in osm

Timestamp:

2015-05-04T20:19:40+02:00 (9 years ago)

Author:

stoecker

Message:

fix deprecations and removed core function

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• data/fr.lang (modified) ( previous)
• data/lt.lang (modified) ( previous)
• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java (modified) (1 diff)

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="7977"/>
+    <property name="plugin.main.version" value="8323"/>
     <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/core/io/geographic/GeographicReader.java

@@ -49 +49 @@
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.gui.DialogPrompter;
+import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 
 import com.vividsolutions.jts.geom.LineString;
@@ -209 +211 @@
                                 "If so, <b>do NOT upload</b> such data to OSM !", crs.getName())+
                         "</html>");
-                dlg.setButtonIcons(new Icon[] {
-                        ImageProvider.get("cancel"),
-                        ImageProvider.overlay(
-                                ImageProvider.get("ok"),
-                                new ImageIcon(ImageProvider.get("warning-small").getImage().getScaledInstance(10 , 10, Image.SCALE_SMOOTH)),
-                                ImageProvider.OverlayPosition.SOUTHEAST)});
+               dlg.setButtonIcons(new Icon[] {
+                        new ImageProvider("cancel").setMaxSize(ImageSizes.LARGEICON).get(),
+                        new ImageProvider("ok").setMaxSize(ImageSizes.LARGEICON).addOverlay(
+                                new ImageOverlay(new ImageProvider("warning-small"), 0.5,0.5,1.0,1.0)).get()});
                 dlg.setToolTipTexts(new String[] {
                         tr("Cancel"),

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.actions.OpenLinkAction;
@@ -51 +52 @@
     }
     
-    @Override public Icon getBaseIcon() {
-        return OdUtils.getImageIcon(handler != null ? handler.getDataLayerIconName() : OdConstants.ICON_CORE_16);
+    @Override public ImageProvider getBaseIconProvider() {
+        return OdUtils.getImageProvider(handler != null ? handler.getDataLayerIconName() : OdConstants.ICON_CORE_16);
     }
 

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

@@ -59 +59 @@
     
     public static final ImageIcon getImageIcon(String iconName, boolean optional) {
-        return new ImageProvider(iconName).setOptional(optional).setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()).get();
+        return getImageProvider(iconName, optional).get();
+    }
+    
+    public static final ImageProvider getImageProvider(String iconName) {
+        return getImageProvider(iconName, false);
+    }
+    
+    public static final ImageProvider getImageProvider(String iconName, boolean optional) {
+        return new ImageProvider(iconName).setOptional(optional).setAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders());
     }