Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AngleSnap.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AngleSnap.java	(revision 35951)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/AngleSnap.java	(revision 35978)
@@ -25,6 +25,6 @@
     public final Double addSnap(Node[] nodes) {
         if (nodes.length == 2) {
-            EastNorth p1 = latlon2eastNorth(nodes[0].getCoor());
-            EastNorth p2 = latlon2eastNorth(nodes[1].getCoor());
+            EastNorth p1 = latlon2eastNorth(nodes[0]);
+            EastNorth p2 = latlon2eastNorth(nodes[1]);
             double heading = p1.heading(p2);
             addSnap(heading);
@@ -38,6 +38,6 @@
     public final void addSnap(Way way) {
         for (Pair<Node, Node> pair : way.getNodePairs(false)) {
-            EastNorth a = latlon2eastNorth(pair.a.getCoor());
-            EastNorth b = latlon2eastNorth(pair.b.getCoor());
+            EastNorth a = latlon2eastNorth(pair.a);
+            EastNorth b = latlon2eastNorth(pair.b);
             double heading = a.heading(b);
             addSnap(heading);
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java	(revision 35951)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/BuildingsToolsPlugin.java	(revision 35978)
@@ -5,4 +5,5 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -18,5 +19,5 @@
     public static final Projection MERCATOR = Projections.getProjectionByCode("EPSG:3857"); // Mercator
 
-    public static EastNorth latlon2eastNorth(LatLon p) {
+    public static EastNorth latlon2eastNorth(ILatLon p) {
         return MERCATOR.latlon2eastNorth(p);
     }
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35951)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/DrawBuildingAction.java	(revision 35978)
@@ -210,10 +210,10 @@
             Node n = MainApplication.getMap().mapView.getNearestNode(mousePos, OsmPrimitive::isUsable);
             if (n != null)
-                return latlon2eastNorth(n.getCoor());
+                return latlon2eastNorth(n);
             IWaySegment<Node, Way> ws = MainApplication.getMap().mapView.getNearestWaySegment(mousePos,
                     OsmPrimitive::isSelectable);
             if (ws != null && ws.getWay().get("building") != null) {
-                EastNorth p1 = latlon2eastNorth(ws.getFirstNode().getCoor());
-                EastNorth p2 = latlon2eastNorth(ws.getSecondNode().getCoor());
+                EastNorth p1 = latlon2eastNorth(ws.getFirstNode());
+                EastNorth p2 = latlon2eastNorth(ws.getSecondNode());
                 EastNorth enX = Geometry.closestPointToSegment(p1, p2,
                         latlon2eastNorth(MainApplication.getMap().mapView.getLatLon(mousePos.x, mousePos.y)));
Index: applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35951)
+++ applications/editors/josm/plugins/buildings_tools/src/org/openstreetmap/josm/plugins/buildings_tools/ToolSettings.java	(revision 35978)
@@ -98,5 +98,5 @@
         } else {
             ToolSettings.shape = Shape.RECTANGLE;
-            return (Shape.RECTANGLE);
+            return Shape.RECTANGLE;
         }
     }