Changeset 34128 in osm for applications/editors/josm/plugins/turnrestrictions/src

Timestamp:

2018-03-26T21:06:01+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13558

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor

Files:

• TurnRestrictionEditor.java (modified) (3 diffs)
• ViaListModel.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java

@@ -546 +546 @@
             }
 
-            MainApplication.undoRedo.add(new AddCommand(getLayer().data, newTurnRestriction));
+            MainApplication.undoRedo.add(new AddCommand(getLayer().getDataSet(), newTurnRestriction));
 
             // make sure everybody is notified about the changes
@@ -568 +568 @@
             editorModel.apply(toUpdate);
             Conflict<Relation> conflict = new Conflict<>(getTurnRestriction(), toUpdate);
-            MainApplication.undoRedo.add(new ConflictAddCommand(getLayer().data, conflict));
+            MainApplication.undoRedo.add(new ConflictAddCommand(getLayer().getDataSet(), conflict));
         }
 
@@ -578 +578 @@
             if (getTurnRestriction().getDataSet() == null) {
                 editorModel.apply(getTurnRestriction());
-                MainApplication.undoRedo.add(new AddCommand(getLayer().data, getTurnRestriction()));
+                MainApplication.undoRedo.add(new AddCommand(getLayer().getDataSet(), getTurnRestriction()));
             } else {
                 Relation toUpdate = new Relation(getTurnRestriction());

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java

@@ -171 +171 @@
         if (idsToInsert == null) return;
         List<OsmPrimitive> primitives = new ArrayList<>(idsToInsert.size());
-        DataSet ds = model.getLayer().data;
+        DataSet ds = model.getLayer().getDataSet();
         for (PrimitiveId id: idsToInsert) {
             OsmPrimitive p = ds.getPrimitiveById(id);