Changeset 33564 in osm

Timestamp:

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

Author:

donvip

Message:

fix warnings

Location:

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

Files:

• SvgImportTask.java (modified) (3 diffs)
• SvgImporter.java (modified) (3 diffs)

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImportTask.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -159 +160 @@
     @Override
     protected void realRun() throws IOException, OsmTransferException {
-        LatLon center = Main.getProjection().eastNorth2latlon(Main.map.mapView.getCenter());
+        LatLon center = Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());
         scale = Settings.getScaleNumerator() / Settings.getScaleDivisor() / Math.cos(Math.toRadians(center.lat()));
         this.center = projection.latlon2eastNorth(center);
@@ -191 +192 @@
             cmds.add(new AddCommand(w));
         }
-        Main.main.undoRedo.add(new SequenceCommand("Import primitives", cmds));
+        MainApplication.undoRedo.add(new SequenceCommand("Import primitives", cmds));
     }
     

applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/SvgImporter.java

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -32 +33 @@
     @Override
     public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
-        if (Main.getLayerManager().getEditLayer() == null) {
+        if (MainApplication.getLayerManager().getEditLayer() == null) {
             JOptionPane.showMessageDialog(Main.parent, tr("Please open or create data layer before importing"));
             return;
@@ -39 +40 @@
         if (dlg.getValue() != 1) return;
         dlg.saveSettings();
-        Main.worker.submit(new SvgImportTask(files));
+        MainApplication.worker.submit(new SvgImportTask(files));
     }
 }