Some last bits I haven't even gotten to documenting, yet...
---
core-dave/src/org/openstreetmap/josm/actions/ReverseWayAction.java | 8 -
core-dave/src/org/openstreetmap/josm/command/ReverseWayCommand.java | 59
++++++++++
2 files changed, 62 insertions(+), 5 deletions(-)
diff -puN
src/org/openstreetmap/josm/actions/ReverseWayAction.java~core-ReverseWayCommand
src/org/openstreetmap/josm/actions/ReverseWayAction.java
---
core/src/org/openstreetmap/josm/actions/ReverseWayAction.java~core-ReverseWayCommand
2008-05-03 12:08:42.000000000 -0700
+++ core-dave/src/org/openstreetmap/josm/actions/ReverseWayAction.java
2008-05-03 12:08:42.000000000 -0700
@@ -14,6 +14,7 @@ import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.command.ChangeCommand;
import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.ReverseWayCommand;
import org.openstreetmap.josm.command.SequenceCommand;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.Node;
@@ -47,11 +48,8 @@ public final class ReverseWayAction exte
return;
}
Collection<Command> c = new LinkedList<Command>();
- for (Way w : sel) {
- Way wnew = new Way(w);
- Collections.reverse(wnew.nodes);
- c.add(new ChangeCommand(w, wnew));
- }
+ for (Way w : sel)
+ c.add(new ReverseWayCommand(w));
Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
Main.map.repaint();
}
diff -puN
src/org/openstreetmap/josm/command/ReverseWayCommand.java~core-ReverseWayCommand
src/org/openstreetmap/josm/command/ReverseWayCommand.java
---
core/src/org/openstreetmap/josm/command/ReverseWayCommand.java~core-ReverseWayCommand
2008-05-03 12:08:42.000000000 -0700
+++ core-dave/src/org/openstreetmap/josm/command/ReverseWayCommand.java
2008-05-03 12:08:42.000000000 -0700
@@ -0,0 +1,59 @@
+// License: GPL. Copyright 2007 by Dave Hansen 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.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+
+/**
+ * Command that basically replaces one OSM primitive by another of the
+ * same type.
+ *
+ * @author daveh
+ */
+public class ReverseWayCommand extends Command {
+
+ // way to reverse;
+ private final Way way;
+
+ public ReverseWayCommand(Way way) {
+ this.way = way;
+ }
+
+ @Override public boolean executeCommand() {
+ super.executeCommand();
+ for (Node n : way.nodes)
+ Main.debug("before way " + way.id + "node: " + n.id);
+ way.reverseNodes();
+ for (Node n : way.nodes)
+ Main.debug("after way " + way.id + "node: " + n.id);
+ //stem.out.println("ReverseWay: " + way.id);
+ way.modified = true;
+ return true;
+ }
+
+ @Override public void undoCommand() {
+ way.reverseNodes();
+ way.modified = this.getOrig(way).modified;
+ }
+
+ @Override public void fillModifiedData(Collection<OsmPrimitive>
modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
+ modified.add(way);
+ }
+
+ @Override public MutableTreeNode description() {
+ NameVisitor v = new NameVisitor();
+ way.visit(v);
+ return new DefaultMutableTreeNode(new JLabel(tr("ReverseWay")+"
"+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
