From 38a1c144a024c6d4fd971fc41fa99232f15bd844 Mon Sep 17 00:00:00 2001
From: Vincent Privat <vincent.privat@gmail.com>
Date: Sat, 25 Nov 2017 02:10:35 +0100
Subject: [PATCH] update to JOSM 12643

---
 build.xml                                                     | 2 +-
 .../josm/plugins/kartverket/KartverketPlugin.java             | 4 ++--
 .../josm/plugins/kartverket/actions/CheckDirectionAction.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index e5ee85e..7ed3317 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,7 @@
     <!-- enter the SVN commit message -->
     <property name="commit.message" value="Initial"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 	<property name="plugin.canloadatruntime" value="true"/>
     <!-- Configure these properties (replace "..." accordingly).
          See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
diff --git a/src/org/openstreetmap/josm/plugins/kartverket/KartverketPlugin.java b/src/org/openstreetmap/josm/plugins/kartverket/KartverketPlugin.java
index 89835ba..ed39400 100644
--- a/src/org/openstreetmap/josm/plugins/kartverket/KartverketPlugin.java
+++ b/src/org/openstreetmap/josm/plugins/kartverket/KartverketPlugin.java
@@ -4,7 +4,7 @@
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -22,7 +22,7 @@ public class KartverketPlugin extends Plugin {
      */
     public KartverketPlugin(PluginInformation info) {
         super(info);
-        JMenu toolsMenu = Main.main.menu.moreToolsMenu;
+        JMenu toolsMenu = MainApplication.getMenu().moreToolsMenu;
         CheckDirection = MainMenu.add(toolsMenu, new CheckDirectionAction());
         mergeWays = MainMenu.add(toolsMenu, new ReplaceWayAction());
     }
diff --git a/src/org/openstreetmap/josm/plugins/kartverket/actions/CheckDirectionAction.java b/src/org/openstreetmap/josm/plugins/kartverket/actions/CheckDirectionAction.java
index db2e7ad..273b8c6 100644
--- a/src/org/openstreetmap/josm/plugins/kartverket/actions/CheckDirectionAction.java
+++ b/src/org/openstreetmap/josm/plugins/kartverket/actions/CheckDirectionAction.java
@@ -9,11 +9,11 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.plugins.kartverket.CheckDirectionDialog;
 import org.openstreetmap.josm.plugins.kartverket.CheckNextWayI;
@@ -59,7 +59,7 @@ private void nextWay() {
                 BoundingXYVisitor boundingVisitor = new BoundingXYVisitor();
                 boundingVisitor.visit(w);
                 boundingVisitor.enlargeToMinSize(2000.);
-                Main.map.mapView.zoomTo(boundingVisitor);
+                MainApplication.getMap().mapView.zoomTo(boundingVisitor);
                 CheckDirectionDialog dialog = new CheckDirectionDialog(this, nWaysCompleted/(1.*nWaysFixme));
                 dialog.makeVisible();
                 isDone = false;