Changeset 32458 in osm for applications/editors/josm

Timestamp:

2016-06-30T00:23:36+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/turnlanes

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="fix toolbar warnings - toolbar still does not work"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!--

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java

@@ -17 +17 @@
 import javax.swing.JToggleButton;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -32 +33 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+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.plugins.turnlanes.model.ModelContainer;
 
-public class TurnLanesDialog extends ToggleDialog implements EditLayerChangeListener, SelectionChangedListener {
+public class TurnLanesDialog extends ToggleDialog implements ActiveLayerChangeListener, SelectionChangedListener {
     private class EditAction extends JosmAction {
         private static final long serialVersionUID = 4114119073563457706L;
@@ -45 +46 @@
             super(tr("Edit"), "dialogs/edit", tr("Edit turn relations and lane lengths for selected node."), null,
                     false);
-            //putValue("toolbar", "turnlanes/edit");            Main.toolbar.register(this);
-            // did not work in 5018
-
         }
         
@@ -66 +64 @@
             super(tr("Validate"), "dialogs/validator", tr("Validate turn- and lane-length-relations for consistency."),
                     null, false);
-            // putValue("toolbar", "turnlanes/validate");            Main.toolbar.register(this);
-            // did not work in 5018
         }
         
@@ -150 +146 @@
         super(tr("Turn Lanes"), "turnlanes.png", tr("Edit turn lanes"), null, 200);
         
-        MapView.addEditLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
         DataSet.addSelectionListener(this);
         
@@ -192 +188 @@
     }
 
-        @Override
-        public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+    @Override
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+        OsmDataLayer oldLayer = e.getPreviousEditLayer();
         if (oldLayer != null) {
             oldLayer.data.removeDataSetListener(dataSetListener);
         }
-        
+        OsmDataLayer newLayer = Main.getLayerManager().getEditLayer();
         if (newLayer != null) {
             newLayer.data.addDataSetListener(dataSetListener);
         }
-        }
-
-        @Override
-        public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    }
+
+    @Override
+    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
         if (selected.equals(new HashSet<>(newSelection))) {
             return;
@@ -210 +207 @@
         selected.clear();
         selected.addAll(newSelection);
-        
+
         refresh();
-        }
-
-        @Override
-        public void destroy() {
-                super.destroy();
-        MapView.removeEditLayerChangeListener(this);
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        Main.getLayerManager().removeActiveLayerChangeListener(this);
         DataSet.removeSelectionListener(this);
         editAction.destroy();
         validateAction.destroy();
-        }
+    }
 }

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/ValidationPanel.java

@@ -37 +37 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            setIssues(new Validator().validate(Main.main.getCurrentDataSet()));
+            setIssues(new Validator().validate(Main.getLayerManager().getEditDataSet()));
         }
     };
@@ -62 +62 @@
         public void actionPerformed(ActionEvent e) {
             if (selected.getRelation() == null) {
-                Main.main.getCurrentDataSet().setSelected(selected.getPrimitives());
+                Main.getLayerManager().getEditDataSet().setSelected(selected.getPrimitives());
             } else {
-                Main.main.getCurrentDataSet().setSelected(selected.getRelation());
+                Main.getLayerManager().getEditDataSet().setSelected(selected.getRelation());
             }
         }