Changeset 33837 in osm for applications/editors/josm/plugins/wms-turbo-challenge2/src

Timestamp:

2017-11-17T21:38:04+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12643

Location:

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge

Files:

• FakeMapView.java (modified) (1 diff)
• GameWindow.java (modified) (2 diffs)
• WMSRacer.java (modified) (5 diffs)

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java

@@ -39 +39 @@
     FakeMapView(MapView parent, double scale) {
         // TODO: MapView constructor contains registering listeners and other code, that probably shouldn't be called in fake map view
-        super(null, null, null);
+        super(null, null);
         this.parent = parent;
         this.scale = scale;

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -63 +64 @@
 
         this.ground = ground;
-        ground_view = new FakeMapView(Main.map.mapView, 0.0000001);
+        ground_view = new FakeMapView(MainApplication.getMap().mapView, 0.0000001);
 
         /* Retrieve start position */

applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java

@@ -11 +11 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -32 +32 @@
         driveAction.updateEnabledState();
 
-        JMenu toolsMenu = Main.main.menu.toolsMenu;
+        JMenu toolsMenu = MainApplication.getMenu().toolsMenu;
         toolsMenu.addSeparator();
         toolsMenu.add(new JMenuItem(driveAction));
@@ -105 +105 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (oldFrame != null) {
-            Main.getLayerManager().removeLayerChangeListener(this);
-            Main.getLayerManager().removeActiveLayerChangeListener(this);
+            MainApplication.getLayerManager().removeLayerChangeListener(this);
+            MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         }
 
@@ -113 +113 @@
 
         if (newFrame != null) {
-            Main.getLayerManager().addLayerChangeListener(this);
-            Main.getLayerManager().addActiveLayerChangeListener(this);
+            MainApplication.getLayerManager().addLayerChangeListener(this);
+            MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         }
     }
@@ -120 +120 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        driveAction.currentLayer = Main.getLayerManager().getActiveLayer();
+        driveAction.currentLayer = MainApplication.getLayerManager().getActiveLayer();
         driveAction.updateEnabledState();
     }