Index: /applications/editors/josm/plugins/turnlanes/build.xml
===================================================================
--- /applications/editors/josm/plugins/turnlanes/build.xml	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/build.xml	(revision 34566)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="fix toolbar warnings - toolbar still does not work"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13922"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!--
Index: /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java
===================================================================
--- /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java	(revision 34566)
@@ -17,7 +17,7 @@
 import java.util.Map;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.plugins.turnlanes.model.Junction;
 import org.openstreetmap.josm.plugins.turnlanes.model.Lane;
@@ -53,6 +53,6 @@
         final Point2D origin = avgOrigin(locs(mc.getPrimaryJunctions()));
 
-        final LatLon originCoor = Main.getProjection().eastNorth2latlon(new EastNorth(origin.getX(), origin.getY()));
-        final LatLon relCoor = Main.getProjection().eastNorth2latlon(
+        final LatLon originCoor = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(origin.getX(), origin.getY()));
+        final LatLon relCoor = ProjectionRegistry.getProjection().eastNorth2latlon(
                 new EastNorth(origin.getX() + 1, origin.getY() + 1));
 
Index: /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiUtil.java
===================================================================
--- /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiUtil.java	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiUtil.java	(revision 34566)
@@ -12,7 +12,7 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.plugins.turnlanes.model.Junction;
 
@@ -134,5 +134,5 @@
 
     public static Point2D loc(Node node) {
-        final EastNorth loc = Main.getProjection().latlon2eastNorth(node.getCoor());
+        final EastNorth loc = ProjectionRegistry.getProjection().latlon2eastNorth(node.getCoor());
         return new Point2D.Double(loc.getX(), -loc.getY());
     }
Index: /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java
===================================================================
--- /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Lane.java	(revision 34566)
@@ -10,5 +10,5 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -221,5 +221,5 @@
         cmd.backup(r).put(key, Turn.join(lanes));
 
-        Main.main.undoRedo.add(cmd);
+        UndoRedoHandler.getInstance().add(cmd);
     }
 
@@ -241,5 +241,5 @@
         getOutgoingRoadEnd().removeLane(cmd, this);
 
-        Main.main.undoRedo.add(cmd);
+        UndoRedoHandler.getInstance().add(cmd);
     }
 
Index: /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Road.java
===================================================================
--- /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Road.java	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Road.java	(revision 34566)
@@ -11,5 +11,5 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
@@ -141,5 +141,5 @@
             }
 
-            Main.main.undoRedo.add(cmd);
+            UndoRedoHandler.getInstance().add(cmd);
         }
 
@@ -184,5 +184,5 @@
             }
 
-            Main.main.undoRedo.add(cmd);
+            UndoRedoHandler.getInstance().add(cmd);
         }
 
Index: /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java
===================================================================
--- /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java	(revision 34565)
+++ /applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java	(revision 34566)
@@ -12,5 +12,5 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -196,5 +196,5 @@
         remove(cmd);
 
-        Main.main.undoRedo.add(cmd);
+        UndoRedoHandler.getInstance().add(cmd);
     }