Changeset 5724 in josm for trunk

Timestamp:

2013-02-17T15:01:13+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #4664 - warn when reverting a way with direction defined by tag

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ReverseWayAction.java (modified) (2 diffs)
• corrector/ReverseWayNoTagCorrector.java (added)
• data/osm/TagCollection.java (modified) (5 diffs)
• gui/ConditionalOptionPaneUtil.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)

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

@@ -19 +19 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.corrector.ReverseWayNoTagCorrector;
 import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
 import org.openstreetmap.josm.corrector.UserCancelException;
@@ -109 +110 @@
      * @param w the way
      * @return the reverse command and the tag correction commands
+     * @throws UserCancelException if user cancels a reverse warning dialog
      */
     public static ReverseWayResult reverseWay(Way w) throws UserCancelException {
+        ReverseWayNoTagCorrector.checkAndConfirmReverseWay(w);
         Way wnew = new Way(w);
         List<Node> nodesCopy = wnew.getNodes();

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -24 +24 @@
  * A TagCollection can be created:
  * <ul>
- *  <li>from the tags managed by a specific {@link OsmPrimitive} with {@link #from(OsmPrimitive)}</li>
+ *  <li>from the tags managed by a specific {@link OsmPrimitive} with {@link #from(Tagged)}</li>
  *  <li>from the union of all tags managed by a collection of {@link OsmPrimitive}s with {@link #unionOfAllPrimitives(Collection)}</li>
  *  <li>from the union of all tags managed by a {@link DataSet} with {@link #unionOfAllPrimitives(DataSet)}</li>
@@ -51 +51 @@
     public static TagCollection from(Tagged primitive) {
         TagCollection tags = new TagCollection();
-        for (String key: primitive.keySet()) {
-            tags.add(new Tag(key, primitive.get(key)));
+        if (primitive != null) {
+            for (String key: primitive.keySet()) {
+                tags.add(new Tag(key, primitive.get(key)));
+            }
         }
         return tags;
@@ -158 +160 @@
 
     /**
+     * Creates a tag collection from <code>tags</code>.
+     * @param tags the collection of tags
+     * @since 5724
+     */
+    public TagCollection(Collection<Tag> tags) {
+        add(tags);
+    }
+
+    /**
      * Replies the number of tags in this tag collection
      *
@@ -637 +648 @@
      * Does nothing if primitives is null
      *
-     * @param primitive  the collection of primitives
+     * @param primitives the collection of primitives
      * @throws IllegalStateException thrown if this tag collection can't be applied
      * because there are keys with multiple values
@@ -657 +668 @@
      */
     public TagCollection intersect(TagCollection other) {
-        if (other == null) {
-            other = new TagCollection();
-        }
-        TagCollection ret = new TagCollection(this);
-        for (Tag tag: tags) {
-            if (other.contains(tag)) {
-                ret.add(tag);
+        TagCollection ret = new TagCollection();
+        if (other != null) {
+            for (Tag tag: tags) {
+                if (other.contains(tag)) {
+                    ret.add(tag);
+                }
             }
         }

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -98 +98 @@
      * @param messageType the message type
      * @param options a list of options
-     * @param defaultOption the default option
+     * @param defaultOption the default option; only meaningful if options is used; can be null
      *
      * @return the option selected by user. {@link JOptionPane#CLOSED_OPTION} if the dialog was closed.

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -31 +31 @@
 import java.util.Set;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.BorderFactory;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JToolBar;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -59 +73 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
-import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
@@ -697 +710 @@
     }
 
-    static boolean confirmAddingPrimtive(OsmPrimitive primitive) throws AddAbortException {
+    static boolean confirmAddingPrimitive(OsmPrimitive primitive) throws AddAbortException {
         String msg = tr("<html>This relation already has one or more members referring to<br>"
                 + "the object ''{0}''<br>"
@@ -747 +760 @@
                     continue;
                 } else if (MemberTableModel.hasMembersReferringTo(relation.getMembers(), Collections.singleton(p))
-                        && !confirmAddingPrimtive(p)) {
+                        && !confirmAddingPrimitive(p)) {
                     continue;
                 }
@@ -776 +789 @@
                 }
                 if (isPotentialDuplicate(primitive))  {
-                    if (confirmAddingPrimtive(primitive)) {
+                    if (confirmAddingPrimitive(primitive)) {
                         ret.add(primitive);
                     }