Index: /applications/editors/josm/plugins/public_transport_layer/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 34548)
+++ /applications/editors/josm/plugins/public_transport_layer/build.xml	(revision 34549)
@@ -3,5 +3,5 @@
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13919"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java
===================================================================
--- /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 34548)
+++ /applications/editors/josm/plugins/public_transport_layer/src/ptl/DistanceBetweenStops.java	(revision 34549)
@@ -12,5 +12,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
@@ -22,8 +21,10 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionType;
 import org.openstreetmap.josm.gui.dialogs.relation.sort.WayConnectionTypeCalculator;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -74,6 +75,6 @@
         double totalLength = 0.0;
         int lengthN = 0;
-        final boolean onlyLowerUnit = Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false);
-        Main.pref.putBoolean("system_of_measurement.use_only_lower_unit", true);
+        final boolean onlyLowerUnit = Config.getPref().getBoolean("system_of_measurement.use_only_lower_unit", false);
+        Config.getPref().putBoolean("system_of_measurement.use_only_lower_unit", true);
         try {
             for (Node n : stopNodes) {
@@ -105,5 +106,5 @@
             sb.insert(0, SystemOfMeasurement.getSystemOfMeasurement().getDistText(totalLength / lengthN, new DecimalFormat("0"), -1));
         } finally {
-            Main.pref.putBoolean("system_of_measurement.use_only_lower_unit", onlyLowerUnit);
+            Config.getPref().putBoolean("system_of_measurement.use_only_lower_unit", onlyLowerUnit);
         }
 
@@ -142,5 +143,6 @@
         for (Relation relation : getLayerManager().getEditDataSet().getSelectedRelations()) {
             if (!isRouteSupported(relation)) {
-                JOptionPane.showMessageDialog(Main.parent, "<html>" + tr("A valid public_transport:version=2 route is required")
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
+                        "<html>" + tr("A valid public_transport:version=2 route is required")
                 + Utils.joinAsHtmlUnorderedList(Collections.singleton(relation.getDisplayName(DefaultNameFormatter.getInstance()))),
                 tr("Invalid selection"), JOptionPane.WARNING_MESSAGE);
@@ -151,5 +153,5 @@
         }
 
-        new ExtendedDialog(Main.parent, getValue(NAME).toString(), new String[]{tr("Close")}) {
+        new ExtendedDialog(MainApplication.getMainFrame(), getValue(NAME).toString(), new String[]{tr("Close")}) {
             {
                 setButtonIcons(new String[]{"ok.png"});
