Changeset 32480 in osm for applications/editors/josm

Timestamp:

2016-07-01T09:38:10+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/sds

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/hot/sds/SdsLoadAction.java (modified) (1 diff)
• src/org/openstreetmap/hot/sds/SdsMenu.java (modified) (3 diffs)

applications/editors/josm/plugins/sds/build.xml

@@ -5 +5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10279"/>
+    <property name="plugin.main.version" value="10353"/>
 
     <!--

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java

@@ -81 +81 @@
                 try {
                     fileStream = new FileInputStream(f);
-                    SdsParser p = new SdsParser(Main.main.getCurrentDataSet(), plugin, false);
+                    SdsParser p = new SdsParser(getLayerManager().getEditDataSet(), plugin, false);
                     InputSource inputSource = new InputSource(fileStream);
                     SAXParserFactory.newInstance().newSAXParser().parse(inputSource, p);

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainMenu;
-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.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 
 @SuppressWarnings("serial")
-public class SdsMenu extends JMenu implements LayerChangeListener {
+public class SdsMenu extends JMenu implements LayerChangeListener, ActiveLayerChangeListener {
 
     private JMenuItem saveItem;
@@ -50 +53 @@
         menu.add(aboutItem);
         
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
         setEnabledState();
     }
@@ -61 +65 @@
   
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {    setEnabledState(); }
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {    setEnabledState(); }
 
     @Override
-    public void layerAdded(Layer newLayer) { setEnabledState(); }
+    public void layerOrderChanged(LayerOrderChangeEvent e) { }
 
     @Override
-    public void layerRemoved(Layer oldLayer) { setEnabledState(); }
+    public void layerAdded(LayerAddEvent e) { setEnabledState(); }
+
+    @Override
+    public void layerRemoving(LayerRemoveEvent e) { setEnabledState(); }
 
     private class SdsAboutAction extends JosmAction {