Changeset 10386 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-06-15T17:25:04+02:00 (9 years ago)

Author:

Don-vip

Message:

gsoc-core - remove more deprecation warnings

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ExtensionFileFilter.java (modified) (2 diffs)
• ZoomToAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.widgets.AbstractFileChooser;
 import org.openstreetmap.josm.io.AllFormatsImporter;
@@ -67 +66 @@
                 FileImporter importer = importerClass.getConstructor().newInstance();
                 importers.add(importer);
-                MapView.addLayerChangeListener(importer);
             } catch (ReflectiveOperationException e) {
                 if (Main.isDebugEnabled()) {

trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java

@@ -12 +12 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListTable;
 import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberTable;
 import org.openstreetmap.josm.gui.dialogs.relation.MemberTable;
-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.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTable;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
-public class ZoomToAction extends AbstractAction implements LayerChangeListener, ListSelectionListener {
+public class ZoomToAction extends AbstractAction implements LayerChangeListener, ActiveLayerChangeListener, ListSelectionListener {
 
     private final OsmPrimitivesTable table;
@@ -98 +102 @@
 
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         updateEnabledState();
     }
 
     @Override
-    public void layerAdded(Layer newLayer) {
+    public void layerAdded(LayerAddEvent e) {
         updateEnabledState();
     }
 
     @Override
-    public void layerRemoved(Layer oldLayer) {
+    public void layerRemoving(LayerRemoveEvent e) {
         updateEnabledState();
     }
+
+    @Override
+    public void layerOrderChanged(LayerOrderChangeEvent e) {
+        // Do nothing
+    }
 }