Changeset 31648 in osm for applications/editors

Timestamp:

2015-10-19T13:45:35+02:00 (9 years ago)

Author:

donvip

Message:

[josm_plugins] remove call to deprecated code

Location:

applications/editors/josm/plugins

Files:

• ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java (modified) (2 diffs)
• measurement/build.xml (modified) (1 diff)
• measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
@@ -286 +286 @@
 
                         totalTimeLabel.setText(String.format("%d:%02d h", hours, minutes));
-                        distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
+                        distLabel.setText(SystemOfMeasurement.getSystemOfMeasurement().getDistText(dist));
                         trackCombo.setEnabled(model.profileCount() > 1);
                         trackCombo.setModel(new TrackModel());

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

@@ -4 +4 @@
     <property name="commit.message" value="recompile dure to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="8554"/>
     <property name="plugin.canloadatruntime" value="true"/>
     

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -18 +18 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
+import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -31 +33 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
-import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.NavigatableComponent.SoMChangeListener;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -143 +143 @@
 
         DataSet.addSelectionListener(this);
-        NavigatableComponent.addSoMChangeListener(this);
+        SystemOfMeasurement.addSoMChangeListener(this);
     }
 
     protected String getDistText(double v) {
-        return NavigatableComponent.getSystemOfMeasurement().getDistText(v, new DecimalFormat("#0.000"), 1e-3);
+        return SystemOfMeasurement.getSystemOfMeasurement().getDistText(v, new DecimalFormat("#0.000"), 1e-3);
     }
 
     protected String getAreaText(double v) {
-        return NavigatableComponent.getSystemOfMeasurement().getAreaText(v, new DecimalFormat("#0.000"), 1e-3);
+        return SystemOfMeasurement.getSystemOfMeasurement().getAreaText(v, new DecimalFormat("#0.000"), 1e-3);
     }
 
     protected String getRadiusText(double v) {
-        return NavigatableComponent.getSystemOfMeasurement().getDistText(v, new DecimalFormat("#0.000"), 1e-3);
+        return SystemOfMeasurement.getSystemOfMeasurement().getDistText(v, new DecimalFormat("#0.000"), 1e-3);
     }
 
@@ -257 +257 @@
     public void destroy() {
         super.destroy();
-        NavigatableComponent.removeSoMChangeListener(this);
+        SystemOfMeasurement.removeSoMChangeListener(this);
         DataSet.removeSelectionListener(this);
         if (ds != null) {