Index: applications/editors/josm/plugins/ElevationProfile/.classpath
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 34506)
+++ applications/editors/josm/plugins/ElevationProfile/.classpath	(revision 34507)
@@ -2,5 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test/unit"/>
+	<classpathentry kind="src" output="buildtest" path="test/unit">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
Index: applications/editors/josm/plugins/ElevationProfile/build.xml
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 34506)
+++ applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 34507)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12669"/>
+    <property name="plugin.main.version" value="14153"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java	(revision 34506)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/HgtReader.java	(revision 34507)
@@ -11,5 +11,5 @@
 import java.util.HashMap;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -44,5 +44,5 @@
                 cache.put(file, null);
                 // Try all resource directories
-                for (String location : Main.pref.getAllPossiblePreferenceDirs()) {
+                for (String location : Preferences.getAllPossiblePreferenceDirs()) {
                     String fullPath = new File(location + File.separator + "elevation", file).getPath();
                     File f = new File(fullPath);
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 34506)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 34507)
@@ -19,6 +19,6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
@@ -151,6 +151,6 @@
 
         // transform to view
-        Point pnt1 = mv.getPoint(wpt1.getEastNorth(Main.getProjection()));
-        Point pnt2 = mv.getPoint(wpt2.getEastNorth(Main.getProjection()));
+        Point pnt1 = mv.getPoint(wpt1.getEastNorth(ProjectionRegistry.getProjection()));
+        Point pnt2 = mv.getPoint(wpt2.getEastNorth(ProjectionRegistry.getProjection()));
 
         // use thick line, if possible
@@ -189,5 +189,5 @@
 
         Color c = getColorForWaypoint(profile, wpt, kind);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
 
         /* Paint full hour label */
@@ -236,5 +236,5 @@
         Color c = getColorForWaypoint(profile, wpt, kind);
         int eleH = (int) ElevationHelper.getElevation(wpt);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
 
         TriangleDir td = TriangleDir.Up;
@@ -360,5 +360,5 @@
 
         Color c = getColorForWaypoint(profile, wpt, kind);
-        Point pnt = mv.getPoint(wpt.getEastNorth(Main.getProjection()));
+        Point pnt = mv.getPoint(wpt.getEastNorth(ProjectionRegistry.getProjection()));
         drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, BIG_WPT_RADIUS);
     }