Changeset 34342 in osm for applications/editors/josm

Timestamp:

2018-06-22T23:57:45+02:00 (7 years ago)

Author:

donvip

Message:

see #josm14120 - fix deprecation warnings

File:

• applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java (modified) (4 diffs)

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -76 +77 @@
     static final String pluginDir = Main.pref.getPluginsDirectory().getAbsolutePath() + "/CommandLine/";
 
-    @SuppressWarnings("serial")
     public CommandLine(PluginInformation info) {
         super(info);
@@ -282 +282 @@
                 Layer olayer = MainApplication.getLayerManager().getActiveLayer();
                 if (olayer != null) {
-                    if (!(olayer instanceof ImageryLayer)) {
-                        List<ImageryLayer> imageryLayers = MainApplication.getLayerManager().getLayersOfType(ImageryLayer.class);
+                    if (!(olayer instanceof AbstractTileSourceLayer)) {
+                        @SuppressWarnings("rawtypes")
+                        List<AbstractTileSourceLayer> imageryLayers = MainApplication.getLayerManager().getLayersOfType(
+                                AbstractTileSourceLayer.class);
                         if (imageryLayers.size() == 1) {
                             olayer = imageryLayers.get(0);
@@ -292 +294 @@
                     }
                 }
-                loadParameter((String.valueOf(((ImageryLayer) olayer).getDx()) + "," + String.valueOf(((ImageryLayer) olayer).getDy())), true);
+                loadParameter((String.valueOf(((AbstractTileSourceLayer<?>) olayer).getDisplaySettings().getDx()) + "," +
+                               String.valueOf(((AbstractTileSourceLayer<?>) olayer).getDisplaySettings().getDy())), true);
                 action = new DummyAction(this);
                 break;