Changeset 2683 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-12-27T16:51:22+01:00 (13 years ago)

Author:

mjulius

Message:

fixes #4149 - exception when undoing reversal of way with tag corrections

don't try to undo Command for a primitive that does not belong to a dataset

fixes issue with ChangeRelationMemberRoleCommand.undoCommand() doing nothing except resetting modified flag
don't reverse tags on way nodes when reversing way
reversing way now also reverses 'incline=*' tags

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangeRelationMemberRoleCommand.java (modified) (2 diffs)
• Command.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -50 +50 @@
 
         oldRole = relation.getMember(position).getRole();
+        if (newRole.equals(oldRole)) return true;
         relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
 
@@ -58 +59 @@
 
     @Override public void undoCommand() {
-        relation.getMember(position).getRole().equals(oldRole);
+        relation.setMember(position, new RelationMember(oldRole, relation.getMember(position).getMember()));
         relation.setModified(oldModified);
     }

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -92 +92 @@
     public void undoCommand() {
         for (Entry<OsmPrimitive, PrimitiveData> e : cloneMap.entrySet()) {
-            e.getKey().load(e.getValue());
+            OsmPrimitive primitive = e.getKey();
+            if (primitive.getDataSet() != null) {
+                e.getKey().load(e.getValue());
+            }
         }
     }