Index: applications/editors/josm/plugins/NanoLog/build.xml
===================================================================
--- applications/editors/josm/plugins/NanoLog/build.xml	(revision 34532)
+++ applications/editors/josm/plugins/NanoLog/build.xml	(revision 34533)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="NanoLog"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12643"/>
+    <property name="plugin.main.version" value="14153"/>
     <property name="plugin.author" value="Ilya Zverev"/>
     <property name="plugin.class" value="nanolog.NanoLogPlugin"/>
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 34532)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/Correlator.java	(revision 34533)
@@ -9,5 +9,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -16,4 +15,6 @@
 import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
@@ -61,5 +62,5 @@
         // No GPX timestamps found, exit
         if (firstGPXDate < 0) {
-            JOptionPane.showMessageDialog(Main.parent,
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                     tr("The selected GPX track does not contain timestamps. Please select another one."),
                     tr("GPX Track has no time information"), JOptionPane.WARNING_MESSAGE);
@@ -218,5 +219,5 @@
      */
     public static long getGpxDate(GpxData data, LatLon pos) {
-        EastNorth en = Main.getProjection().latlon2eastNorth(pos);
+        EastNorth en = ProjectionRegistry.getProjection().latlon2eastNorth(pos);
         for (GpxTrack track : data.tracks) {
             for (GpxTrackSegment segment : track.getSegments()) {
@@ -229,6 +230,6 @@
                             long curWpTime = DateUtils.fromString(curWpTimeStr).getTime();
                             if (prevWp != null) {
-                                EastNorth c1 = Main.getProjection().latlon2eastNorth(prevWp.getCoor());
-                                EastNorth c2 = Main.getProjection().latlon2eastNorth(curWp.getCoor());
+                                EastNorth c1 = ProjectionRegistry.getProjection().latlon2eastNorth(prevWp.getCoor());
+                                EastNorth c2 = ProjectionRegistry.getProjection().latlon2eastNorth(curWp.getCoor());
                                 if (!c1.equals(c2)) {
                                     EastNorth middle = getSegmentAltitudeIntersection(c1, c2, en);
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 34532)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java	(revision 34533)
@@ -29,5 +29,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
@@ -369,5 +368,5 @@
         public void actionPerformed(ActionEvent e) {
             // todo
-            JOptionPane.showMessageDialog(Main.parent, "Sorry, no saving yet", "NanoLog", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), "Sorry, no saving yet", "NanoLog", JOptionPane.ERROR_MESSAGE);
         }
     }
Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java
===================================================================
--- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java	(revision 34532)
+++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java	(revision 34533)
@@ -10,5 +10,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -46,5 +45,5 @@
         public void actionPerformed(ActionEvent e) {
             JFileChooser fc = new JFileChooser();
-            if (fc.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION) {
+            if (fc.showOpenDialog(MainApplication.getMainFrame()) == JFileChooser.APPROVE_OPTION) {
                 try {
                     List<NanoLogEntry> entries = NanoLogLayer.readNanoLog(fc.getSelectedFile());
@@ -55,5 +54,5 @@
                     }
                 } catch (IOException ex) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Could not read NanoLog file:") + "\n" + ex.getMessage());
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Could not read NanoLog file:") + "\n" + ex.getMessage());
                 }
             }