Changeset 33309 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

Timestamp:

2017-05-13T14:21:55+02:00 (9 years ago)

Author:

zverik

Message:

Fixed deprecated method calls

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java (modified) (6 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -20 +21 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.xml.sax.SAXException;
 
 /**
@@ -56 +58 @@
         Projection proj = Main.map.mapView.getProjection();
         LatLon center = proj.eastNorth2latlon(Main.map.mapView.getCenter());
-        ImageryLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
         String imagery = ImageryOffsetTools.getImageryID(layer);
         if (imagery == null)
@@ -74 +76 @@
         if (Main.map == null || Main.map.mapView == null || !Main.map.isVisible())
             state = false;
-        ImageryLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
         if (ImageryOffsetTools.getImageryID(layer) == null)
             state = false;
@@ -128 +130 @@
          * @param imagery Imagery ID for the layer.
          */
-        DownloadOffsetsTask(LatLon center, ImageryLayer layer, String imagery) {
+        DownloadOffsetsTask(LatLon center, AbstractTileSourceLayer layer, String imagery) {
             super(null, tr("Loading imagery offsets..."));
             try {
@@ -162 +164 @@
             try {
                 offsets = new IODBReader(inp).parse();
-            } catch (Exception e) {
+            } catch (IOException | SAXException e) {
                 throw new UploadException(tr("Error processing XML response: {0}", e.getMessage()));
             }