Changeset 34523 in osm for applications/editors/josm/plugins

Timestamp:

2018-08-18T18:13:25+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/infomode

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/infomode/InfoMode.java (modified) (5 diffs)

applications/editors/josm/plugins/infomode/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="InfoMode : for shortcurt parser"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12630"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java

@@ -23 +23 @@
 import javax.swing.PopupFactory;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.data.Bounds;
@@ -30 +29 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
@@ -70 +70 @@
         /*if (!(Main.main.getActiveLayer() instanceof GpxLayer)) {
             boolean answer = ConditionalOptionPaneUtil.showConfirmationDialog(
-                    "scan_all_layers", Main.parent,
+                    "scan_all_layers", MainApplication.getMainFrame(),
                     tr("Please select GPX layer to view only its trackpoint info. Do you want to scan all GPX layers?"),
                     tr("Select layer to scan"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_OPTION );
@@ -247 +247 @@
                     oldWp = null; // next segment will have new previous point
                     for (WayPoint S : seg.getWayPoints()) {
-                        d = S.getEastNorth(Main.getProjection()).distance(pos);
+                        d = S.getEastNorth(ProjectionRegistry.getProjection()).distance(pos);
 
                         if (d < minDist && d < maxD) {
@@ -271 +271 @@
                     Point oldP = null, curP = null; // next segment will have new previous point
                         for (WayPoint S : seg.getWayPoints()) {
-                            curP = mv.getPoint(S.getEastNorth(Main.getProjection()));
+                            curP = mv.getPoint(S.getEastNorth(ProjectionRegistry.getProjection()));
                             if (oldP != null) g.drawLine(oldP.x, oldP.y, curP.x, curP.y);
                             oldP = curP;