Index: /applications/editors/josm/plugins/public_transport/build.xml
===================================================================
--- /applications/editors/josm/plugins/public_transport/build.xml	(revision 33763)
+++ /applications/editors/josm/plugins/public_transport/build.xml	(revision 33764)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12636"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <property name="plugin.author" value="Roland M. Olbricht"/>
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 33763)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterAction.java	(revision 33764)
@@ -31,4 +31,5 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.tools.Logging;
 
 public class GTFSImporterAction extends JosmAction {
@@ -52,5 +53,5 @@
                 false);
         putValue("toolbar", "publictransport/gtfsimporter");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -161,8 +162,8 @@
             }
         } catch (FileNotFoundException e) {
-            Main.error(e);
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("File \"{0}\" does not exist", file.getName()));
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
             JOptionPane.showMessageDialog(null, tr("IOException \"{0}\" occurred", e.toString()));
         }
@@ -297,5 +298,5 @@
             return;
         box.enlargeBoundingBox();
-        Main.map.mapView.zoomTo(box);
+        MainApplication.getMap().mapView.zoomTo(box);
     }
 
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java	(revision 33763)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java	(revision 33764)
@@ -9,5 +9,5 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -24,5 +24,5 @@
 
     public static void refreshMenu() {
-        MainMenu menu = Main.main.menu;
+        MainMenu menu = MainApplication.getMenu();
 
         if (jMenu == null)
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 33763)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/RoutePatternAction.java	(revision 33764)
@@ -326,5 +326,5 @@
                 false);
         putValue("toolbar", "publictransport/routepattern");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -1102,5 +1102,5 @@
                 return;
             box.enlargeBoundingBox();
-            Main.map.mapView.zoomTo(box);
+            MainApplication.getMap().mapView.zoomTo(box);
         } else if ("routePattern.itineraryMark".equals(event.getActionCommand())) {
             OsmPrimitive[] osmp = {null};
@@ -1332,5 +1332,5 @@
                 return;
             box.enlargeBoundingBox();
-            Main.map.mapView.zoomTo(box);
+            MainApplication.getMap().mapView.zoomTo(box);
         } else if ("routePattern.stoplistMark".equals(event.getActionCommand())) {
             OsmPrimitive[] osmp = {null};
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 33763)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 33764)
@@ -58,5 +58,5 @@
                 false);
         putValue("toolbar", "publictransport/stopimporter");
-        Main.toolbar.register(this);
+        MainApplication.getToolbar().register(this);
     }
 
@@ -319,5 +319,5 @@
             return;
         box.enlargeBoundingBox();
-        Main.map.mapView.zoomTo(box);
+        MainApplication.getMap().mapView.zoomTo(box);
     }