Changeset 29750 in osm for applications

Timestamp:

2013-07-07T00:30:33+02:00 (11 years ago)

Author:

donvip

Message:

[josm_measurement] see #josm6515 - update to JOSM 6056

Location:

applications/editors/josm/plugins/measurement

Files:

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

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="5560"/>
+    <property name="plugin.main.version" value="6056"/>
     
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.NavigatableComponent.SoMChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -44 +45 @@
  * @author ramack
  */
-public class MeasurementDialog extends ToggleDialog implements SelectionChangedListener, DataSetListener {
+public class MeasurementDialog extends ToggleDialog implements SelectionChangedListener, DataSetListener, SoMChangeListener {
     private static final long serialVersionUID = 4708541586297950021L;
 
@@ -131 +132 @@
         
         DataSet.addSelectionListener(this);
+        NavigatableComponent.addSoMChangeListener(this);
     }
 
@@ -210 +212 @@
         }
 
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.gui.dialogs.ToggleDialog#destroy()
-         */
         @Override
         public void destroy() {
                 super.destroy();
+                NavigatableComponent.removeSoMChangeListener(this);
                 DataSet.removeSelectionListener(this);
                 if (ds != null) {
@@ -249 +249 @@
     @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
     @Override public void dataChanged(DataChangedEvent event) {}
+
+        @Override
+        public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
+                // Refresh selection to take into account new system of measurement
+                selectionChanged(Main.main.getCurrentDataSet().getSelected());
+        }
 }