Changeset 27675 in osm for applications/editors

Timestamp:

2012-02-01T16:59:09+01:00 (13 years ago)

Author:

stoecker

Message:

fix deprecations

Location:

applications/editors/josm/plugins

Files:

• roadsigns/build.xml (modified) (1 diff)
• roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java (modified) (1 diff)
• tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java (modified) (1 diff)
• tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java (modified) (1 diff)

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

@@ -30 +30 @@
     <property name="commit.message" value="preset maintenance (Fahrradstraße)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4721"/>
 
     <!--

applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java

@@ -82 +82 @@
     public ImageIcon getIcon() {
         if (icon == null) {
-            icon = ImageProvider.getIfAvailable(RoadSignsPlugin.iconDirs, "plugin.sign."+id, null, iconURL, null);
+            icon = new ImageProvider(iconURL).setDirs(RoadSignsPlugin.iconDirs).setId("plugin.sign."+id).setOptional(true).get();
         }
         return icon;

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java

@@ -28 +28 @@
                 Shortcut.registerShortcut("edit:launchtageditor", tr("Launches the tag editor dialog"),
                         KeyEvent.VK_T,Shortcut.GROUP_EDIT)
-                ,true);
+                , true, "tageditor/launch", true);
 
         DataSet.addSelectionListener(this);

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java

@@ -35 +35 @@
     
     public Icon getIcon() {
-        if (icon == null) {
+        if (icon == null && getIconName() != null) {
             Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-            icon = ImageProvider.getIfAvailable(s, "presets", null, getIconName(), zipIconArchive);
-            if (icon == null) return null;
-            Image i = icon.getImage().getScaledInstance(16, 16, Image.SCALE_DEFAULT);
-            icon = new ImageIcon(i);
+            icon = new ImageProvider(getIconName()).setDirs(s).setId("presets").setArchive(zipIconArchive).setOptional(true)
+            .setMaxWidth(16).setMaxHeight(16).get();
         }
         return icon;