---
core-dave/src/org/openstreetmap/josm/command/AddRelationMemberCommand.java | 70 ++++++++++ 1 file changed, 70 insertions(+) diff -puN src/org/openstreetmap/josm/command/AddRelationMemberCommand.java~AddRelationMemberCommand src/org/openstreetmap/josm/command/AddRelationMemberCommand.java --- core/src/org/openstreetmap/josm/command/AddRelationMemberCommand.java~AddRelationMemberCommand 2008-04-28 18:59:26.000000000 -0700 +++ core-dave/src/org/openstreetmap/josm/command/AddRelationMemberCommand.java 2008-04-28 18:59:26.000000000 -0700 @@ -0,0 +1,70 @@ +// License: GPL. Copyright 2007 by Immanuel Scholz and others +package org.openstreetmap.josm.command; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.Collection; + +import javax.swing.JLabel; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.MutableTreeNode; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.*; + +import org.openstreetmap.josm.data.osm.visitor.NameVisitor; + +/** + * Command that adds a relation to an OSM object + * + * @author daveh + */ +public class AddRelationMemberCommand extends Command { + + // container object in which to replace a sub object + private final Relation relation; + private boolean old_modified; + // the sub-object to be replaced + private final RelationMember member; + // its replacement + private int location = -1; + + public AddRelationMemberCommand(Relation _relation, RelationMember _member) { + this.relation = _relation; + this.member = _member; + } + public AddRelationMemberCommand(Relation _relation, RelationMember _member, int _location) { + this.relation = _relation; + this.member = _member; + location = _location; + } + + @Override public boolean executeCommand() { + super.executeCommand(); + if (location == -1) { + location = relation.members.size(); + relation.members.add(member); + } else + relation.members.add(location, member); + this.old_modified = relation.modified; + relation.modified = true; + return true; + } + + @Override public void undoCommand() { + super.undoCommand(); + RelationMember removed = relation.members.remove(location); + if (removed != member) + Main.debug("removed wrong member"); + relation.modified = this.old_modified; + } + + @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {} + + @Override public MutableTreeNode description() { + NameVisitor v = new NameVisitor(); + relation.visit(v); + return new DefaultMutableTreeNode(new JLabel(tr("AddRelationMemberToRelation")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); + } +} _ _______________________________________________ josm-dev mailing list josm-dev@openstreetmap.org http://lists.openstreetmap.org/cgi-bin/mailman/listinfo/josm-dev