Index: applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java
===================================================================
--- applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java	(revision 33527)
+++ applications/editors/josm/plugins/public_transport_layer/src/ptl/Plugin.java	(revision 33528)
@@ -2,5 +2,5 @@
 package ptl;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -10,7 +10,6 @@
     public Plugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.dataMenu, new PublicTransportLayer.AddLayerAction());
-        MainMenu.add(Main.main.menu.dataMenu, new DistanceBetweenStops());
+        MainMenu.add(MainApplication.getMenu().dataMenu, new PublicTransportLayer.AddLayerAction());
+        MainMenu.add(MainApplication.getMenu().dataMenu, new DistanceBetweenStops());
     }
 }
-
Index: applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java
===================================================================
--- applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 33527)
+++ applications/editors/josm/plugins/public_transport_layer/src/ptl/PublicTransportLayer.java	(revision 33528)
@@ -15,5 +15,4 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.Bounds;
@@ -25,4 +24,5 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -35,4 +35,5 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
@@ -80,5 +81,5 @@
                 color = ColorHelper.html2color(relation.get("colour"));
             } catch (RuntimeException ignore) {
-                Main.trace(ignore);
+                Logging.trace(ignore);
             }
             renderer.drawWay(way, color, new BasicStroke(1), null, null, 0, doDrawArrows, false, false, false);
@@ -144,5 +145,5 @@
                     public void actionPerformed(ActionEvent e) {
                         doDrawArrows = !doDrawArrows;
-                        Main.map.repaint();
+                        MainApplication.getMap().repaint();
                     }
                 },
@@ -151,5 +152,5 @@
                     public void actionPerformed(ActionEvent e) {
                         doDrawRefLabels = !doDrawRefLabels;
-                        Main.map.repaint();
+                        MainApplication.getMap().repaint();
                     }
                 }
@@ -165,5 +166,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.getLayerManager().addLayer(new PublicTransportLayer());
+            MainApplication.getLayerManager().addLayer(new PublicTransportLayer());
         }
     }