Changeset 25698 in osm for applications

Timestamp:

2011-03-24T21:57:35+01:00 (13 years ago)

Author:

zverik

Message:

quick fixes (changerolecommand does not work!)

Location:

applications/editors/josm/plugins/relcontext/src/relcontext

Files:

• RelContextDialog.java (modified) (2 diffs)
• actions/SortAndFixAction.java (modified) (1 diff)

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -30 +30 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -519 +520 @@
                 if( selected.contains(m.getMember()) ) {
                     if( !role.equals(m.getRole()) ) {
+                        r.setMember(i, new RelationMember(role, m.getMember()));
                         commands.add(new ChangeRelationMemberRoleCommand(r, i, role));
                     }
                 }
             }
-            if( !commands.isEmpty() )
-                Main.main.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
+            if( !commands.isEmpty() ) {
+                Main.main.undoRedo.add(new ChangeCommand(chosenRelation.get(), r));
+//                Main.main.undoRedo.add(new SequenceCommand(tr("Change relation member roles to {0}", role), commands));
+            }
         }
     }

applications/editors/josm/plugins/relcontext/src/relcontext/actions/SortAndFixAction.java

@@ -20 +20 @@
 //        putValue(Action.NAME, "AZ");
         putValue(Action.SMALL_ICON, ImageProvider.get("data", "warning"));
-        putValue(Action.SHORT_DESCRIPTION, tr("Sort members and fix their roles"));
+        putValue(Action.SHORT_DESCRIPTION, tr("Fix roles of the chosen relation members"));
         this.rel = rel;
         rel.addChosenRelationListener(this);