Changeset 32471 in osm for applications

Timestamp:

2016-06-30T20:15:34+02:00 (9 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/merge-overlap

Files:

• build.xml (modified) (1 diff)
• src/mergeoverlap/MergeOverlapAction.java (modified) (4 diffs)

applications/editors/josm/plugins/merge-overlap/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8974"/>
+    <property name="plugin.main.version" value="10353"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

@@ -82 +82 @@
 
         // For every selected way
-        for (OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
+        for (OsmPrimitive osm : getLayerManager().getEditDataSet().getSelected()) {
             if (osm instanceof Way && !osm.isDeleted()) {
                 Way way = (Way) osm;
@@ -163 +163 @@
             if (!nodes.isEmpty() && !way.isClosed() || nodes.size() >= 2) {
                 List<List<Node>> wayChunks = SplitWayAction.buildSplitChunks(way, new ArrayList<>(nodes));
-                SplitWayResult result = splitWay(getEditLayer(), way, wayChunks);
+                SplitWayResult result = splitWay(getLayerManager().getEditLayer(), way, wayChunks);
 
                 cmds.add(result.getCommand());
@@ -237 +237 @@
         // Commit
         Main.main.undoRedo.add(new SequenceCommand(tr("Merge Overlap (combine)"), cmds));
-        getCurrentDataSet().setSelected(sel);
+        getLayerManager().getEditDataSet().setSelected(sel);
         Main.map.repaint();
 
@@ -681 +681 @@
     @Override
     protected void updateEnabledState() {
-        if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             setEnabled(false);
         } else {
-            updateEnabledState(getCurrentDataSet().getSelected());
+            updateEnabledState(getLayerManager().getEditDataSet().getSelected());
         }
     }