Changeset 32518 in osm

Timestamp:

2016-07-02T00:22:51+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

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

Files:

• .settings/org.eclipse.jdt.core.prefs (modified) (1 diff)
• .settings/org.eclipse.jdt.ui.prefs (added)
• src/wmsturbochallenge/GameWindow.java (modified) (1 diff)
• src/wmsturbochallenge/WMSRacer.java (modified) (5 diffs)

applications/editors/josm/plugins/wms-turbo-challenge2/.settings/org.eclipse.jdt.core.prefs

@@ -81 +81 @@
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

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

@@ -130 +130 @@
                         new HashMap<String, Object>()));
 
-            ground_view.parent.addLayer(
+            ground_view.parent.getLayerManager().addLayer(
                     new GpxLayer(data, "Car GPS trace"));
         }

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

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
-public class WMSRacer extends Plugin implements LayerChangeListener {
+public class WMSRacer extends Plugin implements LayerChangeListener, ActiveLayerChangeListener {
     public WMSRacer(PluginInformation info) {
         super(info);
@@ -47 +51 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent ev) {
             if (groundLayer == null ||
@@ -55 +60 @@
         }
 
+        @Override
         public void updateEnabledState() {
             if (frame == null) {
@@ -80 +86 @@
              * horizontal scanlines (lines equidistant from
              * camera eye)) */
-            for (Layer l : frame.mapView.getAllLayers())
+            for (Layer l : frame.mapView.getLayerManager().getLayers())
                 if (l.isBackgroundLayer()) {
                     groundLayer = l;
@@ -94 +100 @@
     protected DriveAction driveAction = new DriveAction();
 
+    @Override
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
-        if (oldFrame != null)
-            MapView.removeLayerChangeListener(this);
+        if (oldFrame != null) {
+            Main.getLayerManager().removeLayerChangeListener(this);
+            Main.getLayerManager().removeActiveLayerChangeListener(this);
+        }
 
         driveAction.frame = newFrame;
         driveAction.updateEnabledState();
 
-        if (newFrame != null)
-            MapView.addLayerChangeListener(this);
+        if (newFrame != null) {
+            Main.getLayerManager().addLayerChangeListener(this);
+            Main.getLayerManager().addActiveLayerChangeListener(this);
+        }
     }
 
-    /* LayerChangeListener methods */
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        driveAction.currentLayer = newLayer;
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        driveAction.currentLayer = Main.getLayerManager().getActiveLayer();
         driveAction.updateEnabledState();
     }
 
-    public void layerAdded(Layer newLayer) {
+    @Override
+    public void layerAdded(LayerAddEvent e) {
         driveAction.updateEnabledState();
     }
 
-    public void layerRemoved(Layer oldLayer) {
+    @Override
+    public void layerRemoving(LayerRemoveEvent e) {
         driveAction.updateEnabledState();
     }
+
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+        // Do nothing
+    }
 }