Changeset 34505 in osm for applications/editors/josm/plugins/editgpx/src/org

Timestamp:

2018-08-18T15:31:40+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

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

Files:

• EditGpxLayer.java (modified) (2 diffs)
• EditGpxMode.java (modified) (2 diffs)
• GPXLayerImportAction.java (modified) (3 diffs)

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java

@@ -17 +17 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -105 +105 @@
         //don't iterate through dataSet whiling making changes
         synchronized(layerImport.importing) {
-            Projection projection = Main.getProjection();
+            Projection projection = ProjectionRegistry.getProjection();
             for (EditGpxTrack track: data.getTracks()) {
                 for (EditGpxTrackSegment segment: track.getSegments()) {

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxMode.java

@@ -15 +15 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -89 +89 @@
         //go through nodes and mark the ones in the selection rect as deleted
         if (currentEditLayer != null) {
-            Projection projection = Main.getProjection();
+            Projection projection = ProjectionRegistry.getProjection();
             for (EditGpxTrack track: currentEditLayer.data.getTracks()) {
                 for (EditGpxTrackSegment segment: track.getSegments()) {

applications/editors/josm/plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java

@@ -23 +23 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -87 +86 @@
                 }
             };
-            final JDialog dlg = optionPane.createDialog(Main.parent, tr("Import path from GPX layer"));
+            final JDialog dlg = optionPane.createDialog(MainApplication.getMainFrame(), tr("Import path from GPX layer"));
             dlg.setVisible(true);
 
@@ -108 +107 @@
         } else {
             // no gps layer
-            JOptionPane.showMessageDialog(Main.parent,tr("No GPX data layer found."));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),tr("No GPX data layer found."));
         }
     }