Changeset 33708 in osm for applications

Timestamp:

2017-10-07T13:53:59+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15403, fix #josm15407, fix #josm15412

Location:

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix

Files:

• AssociatedStreetFixer.java (modified) (3 diffs)
• BoundaryFixer.java (modified) (2 diffs)
• PublicTransportFixer.java (modified) (2 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/AssociatedStreetFixer.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 
 public class AssociatedStreetFixer extends RelationFixer {
@@ -134 +135 @@
         List<Command> commandList = new ArrayList<>();
         if (fixed) {
-            commandList.add(new ChangeCommand(source, rel));
+            commandList.add(new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), source, rel));
         }
 
@@ -150 +151 @@
                 newWay.put("name", commonName);
 
-                commandList.add(new ChangeCommand(oldWay, newWay));
+                commandList.add(new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), oldWay, newWay));
             }
          */

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.MainApplication;
 
 
@@ -65 +66 @@
             r = rr;
         }
-        return fixed ? new ChangeCommand(rel, r) : null;
+        return fixed ? new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), rel, r) : null;
     }
 

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/PublicTransportFixer.java

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.MainApplication;
 
 import relcontext.actions.PublicTransportHelper;
@@ -63 +64 @@
             r = rr;
         }
-        return fixed ? new ChangeCommand(rel, r) : null;
+        return fixed ? new ChangeCommand(MainApplication.getLayerManager().getEditDataSet(), rel, r) : null;
     }