Index: /applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 33884)
+++ /applications/editors/josm/plugins/gpxfilter/build.xml	(revision 33885)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <property name="plugin.author" value="Upliner"/>
Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java	(revision 33884)
+++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java	(revision 33885)
@@ -7,6 +7,6 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -28,5 +28,5 @@
     @Override
     public void actionPerformed(ActionEvent arg0) {
-        getLayerManager().addLayer(new EGpxLayer(Main.map.mapView.getRealBounds()));
+        getLayerManager().addLayer(new EGpxLayer(MainApplication.getMap().mapView.getRealBounds()));
     }
 }
Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java	(revision 33884)
+++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java	(revision 33885)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -29,5 +28,5 @@
                     }
 
-                    Main.map.repaint();
+                    invalidate();
                 }
                 grabber.cancel();
Index: /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java
===================================================================
--- /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java	(revision 33884)
+++ /applications/editors/josm/plugins/gpxfilter/src/gpxfilter/GpxFilterPlugin.java	(revision 33885)
@@ -2,5 +2,5 @@
 package gpxfilter;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -11,5 +11,5 @@
     public GpxFilterPlugin(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.gpsMenu, new AddEGpxLayerAction(), false, 0);
+        MainMenu.add(MainApplication.getMenu().gpsMenu, new AddEGpxLayerAction(), false, 0);
     }