[josm-plugins] 03/07: Imported Upstream version 0.0.svn31722+ds

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm-plugins.

commit 9d0ed6b05e030339222ca562e2595c298894f4e2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 30 12:15:51 2015 +0100

    Imported Upstream version 0.0.svn31722+ds
---
 measurement/build.xml                                      |  2 +-
 .../josm/plugins/measurement/MeasurementDialog.java        | 14 +++++++-------
 .../com/innovant/josm/plugin/routing/gui/RoutingMenu.java  |  3 +--
 svn-info.xml                                               |  6 +++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/measurement/build.xml b/measurement/build.xml
index e5ba0c3..244d1f8 100644
--- a/measurement/build.xml
+++ b/measurement/build.xml
@@ -3,7 +3,7 @@
     <!-- enter the SVN commit message -->
     <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"/>
     
     <!-- Configure these properties (replace "..." accordingly).
diff --git a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
index 861d704..58af60d 100644
--- a/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
+++ b/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
@@ -17,6 +17,8 @@ import javax.swing.JPanel;
 
 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;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -30,8 +32,6 @@ import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
 import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
 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;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -142,19 +142,19 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL
         }));
 
         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);
     }
 
     protected String getAngleText(double v) {
@@ -256,7 +256,7 @@ public class MeasurementDialog extends ToggleDialog implements SelectionChangedL
     @Override
     public void destroy() {
         super.destroy();
-        NavigatableComponent.removeSoMChangeListener(this);
+        SystemOfMeasurement.removeSoMChangeListener(this);
         DataSet.removeSelectionListener(this);
         if (ds != null) {
             ds.removeDataSetListener(this);
diff --git a/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java b/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
index 908fd63..c4c24f7 100644
--- a/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
+++ b/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java
@@ -28,7 +28,6 @@
 package com.innovant.josm.plugin.routing.gui;
 
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -74,7 +73,7 @@ public class RoutingMenu extends JMenu {
      */
     public RoutingMenu() {
         MainMenu mm = Main.main.menu;
-        menu = mm.addMenu(marktr("Routing"), KeyEvent.VK_O, mm.getDefaultMenuPos(), ht("/Plugin/Routing"));
+        menu = mm.addMenu("Routing", tr("Routing"), KeyEvent.VK_O, mm.getDefaultMenuPos(), ht("/Plugin/Routing"));
 
         startMI = new JMenuItem(tr("Add routing layer"));
         startMI.addActionListener(new ActionListener() {
diff --git a/svn-info.xml b/svn-info.xml
index 2238073..3cb72d6 100644
--- a/svn-info.xml
+++ b/svn-info.xml
@@ -3,7 +3,7 @@
 <entry
    kind="dir"
    path="plugins"
-   revision="31608">
+   revision="31722">
 <url>https://svn.openstreetmap.org/applications/editors/josm/plugins</url>
 <relative-url>^/applications/editors/josm/plugins</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>b9d5c4c9-76e1-0310-9c85-f3177eceb1e4</uuid>
 </repository>
 <commit
-   revision="31608">
+   revision="31722">
 <author>malcolmh</author>
-<date>2015-10-09T13:24:00.828532Z</date>
+<date>2015-10-29T22:01:53.140891Z</date>
 </commit>
 </entry>
 </info>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git