Changeset 3504 in josm for trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

Timestamp:

01.09.2010 10:48:28 (21 months ago)

Author:

bastiK

Message:

reworked reverseWay and combineWay such that it can be used by other actions without hack (see #5179 - Join overlapping areas rewrite)

File:

• trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -24 +25 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 public final class ReverseWayAction extends JosmAction {
+
+    public static class ReverseWayResult {
+        private Way newWay;
+        private Collection<Command> tagCorrectionCommands;
+        private Command reverseCommand;
+
+        public ReverseWayResult(Way newWay, Collection<Command> tagCorrectionCommands, Command reverseCommand) {
+            this.newWay = newWay;
+            this.tagCorrectionCommands = tagCorrectionCommands;
+            this.reverseCommand = reverseCommand;
+        }
+
+        public Way getNewWay() {
+            return newWay;
+        }
+
+        public Collection<Command> getCommands() {
+            List<Command> c = new ArrayList<Command>();
+            c.addAll(tagCorrectionCommands);
+            c.add(reverseCommand);
+            return c;
+        }
+
+        public Command getAsSequenceCommand() {
+            return new SequenceCommand(tr("Reverse way"), getCommands());
+        }
+
+        public Command getReverseCommand() {
+            return reverseCommand;
+        }
+
+        public Collection<Command> getTagCorrectionCommands() {
+            return tagCorrectionCommands;
+        }
+    }
 
     public ReverseWayAction() {
         super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
                 Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true);
-        putValue("help", ht("/Action/ReverseWay"));
+        putValue("help", ht("/Action/ReverseWays"));
     }
 
@@ -51 +88 @@
 
         boolean propertiesUpdated = false;
-        ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector();
         Collection<Command> c = new LinkedList<Command>();
         for (Way w : sel) {
-            Way wnew = new Way(w);
-            List<Node> nodesCopy = wnew.getNodes();
-            Collections.reverse(nodesCopy);
-            wnew.setNodes(nodesCopy);
-            if (Main.pref.getBoolean("tag-correction.reverse-way", true)) {
-                try
-                {
-                    final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(w, wnew);
-                    propertiesUpdated = propertiesUpdated
-                    || (changePropertyCommands != null && !changePropertyCommands.isEmpty());
-                    c.addAll(changePropertyCommands);
-                }
-                catch(UserCancelException ex)
-                {
-                    return;
-                }
+            ReverseWayResult revResult;
+            try {
+                revResult = reverseWay(w);
+            } catch (UserCancelException ex) {
+                return;
             }
-            c.add(new ChangeCommand(w, wnew));
+            c.addAll(revResult.getCommands());
+            propertiesUpdated |= !revResult.getTagCorrectionCommands().isEmpty();
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
@@ -78 +104 @@
         }
         Main.map.repaint();
+    }
+
+    /**
+     * @param w the way
+     * @return the reverse command and the tag correction commands
+     */
+    public static ReverseWayResult reverseWay(Way w) throws UserCancelException {
+        Way wnew = new Way(w);
+        List<Node> nodesCopy = wnew.getNodes();
+        Collections.reverse(nodesCopy);
+        wnew.setNodes(nodesCopy);
+
+        Collection<Command> corrCmds = Collections.<Command>emptyList();
+        if (Main.pref.getBoolean("tag-correction.reverse-way", true)) {
+            corrCmds = (new ReverseWayTagCorrector()).execute(w, wnew);
+        }
+        return new ReverseWayResult(wnew, corrCmds, new ChangeCommand(w, wnew));
     }
 
@@ -102 +145 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        if (selection == null) {
-            setEnabled(false);
-            return;
-        }
-        int n = 0;
-        for (OsmPrimitive primitive : selection) {
-            if (primitive instanceof Way) {
-                n++;
-            }
-        }
-        setEnabled(n > 0);
+        setEnabled(Utils.exists(selection, OsmPrimitive.wayPredicate));
     }
 }