Changeset 33562 in osm for applications/editors/josm/plugins/ImportImagePlugin/src/org

Timestamp:

2017-08-27T19:21:21+02:00 (7 years ago)

Author:

donvip

Message:

fix warnings

Location:

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin

Files:

• ImageLayer.java (modified) (2 diffs)
• ImportImageFileImporter.java (modified) (3 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -299 +300 @@
         BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
         visitBoundingBox(boundingXYVisitor);
-        Main.map.mapView.zoomTo(boundingXYVisitor);
+        MainApplication.getMap().mapView.zoomTo(boundingXYVisitor);
     }
 

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java

@@ -12 +12 @@
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -50 +51 @@
                 layer = new ImageLayer(file);
             } catch (LayerCreationCanceledException e) {
-            // if user decides that layer should not be created just return.
+                // if user decides that layer should not be created just return.
                 continue;
             } catch (Exception e) {
@@ -59 +60 @@
 
             // Add layer:
-            Main.getLayerManager().addLayer(layer);
+            MainApplication.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);
-            Main.map.mapView.zoomTo(boundingXYVisitor);
+            MainApplication.getMap().mapView.zoomTo(boundingXYVisitor);
         }
     }