Changeset 34768 in osm

Timestamp:

2018-12-07T16:20:47+01:00 (6 years ago)

Author:

gerdp

Message:

fix #14862 Shift+R was broken

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java (modified) (7 diffs)

applications/editors/josm/plugins/utilsplugin2/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="[josm_utilsplugin2]: select boundary by double-click; multitagger table highlights"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14518"/>
 
     <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.function.Predicate;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -21 +18 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -31 +30 @@
 public class TagBufferAction extends JosmAction {
     private static final String TITLE = tr("Copy tags from previous selection");
-    private static final Predicate<OsmPrimitive> IS_TAGGED_PREDICATE = object -> object.isTagged();
-    private Map<String, String> tags = new HashMap<>();
-    private Map<String, String> currentTags = new HashMap<>();
-    private Set<OsmPrimitive> selectionBuf = new HashSet<>();
-
+    private static final TagCollection EmptyTags = new TagCollection();
+    private final Set<OsmPrimitive> selectionBuf = new HashSet<>();
+    private TagCollection tagsToPaste = EmptyTags;
     /**
      * Constructs a new {@code TagBufferAction}.
@@ -51 +48 @@
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
-        if (selection.isEmpty())
+        if (selection.isEmpty() || tagsToPaste.isEmpty())
             return;
 
         List<Command> commands = new ArrayList<>();
-        for (String key : tags.keySet()) {
-            String value = tags.get(key);
+        for (Tag tag : tagsToPaste) {
             boolean foundNew = false;
             for (OsmPrimitive p : selection) {
-                if (!p.hasKey(key) || !p.get(key).equals(value)) {
+                if (!p.hasTag(tag.getKey(), tag.getValue())) {
                     foundNew = true;
                     break;
@@ -65 +61 @@
             }
             if (foundNew)
-                commands.add(new ChangePropertyCommand(selection, key, value));
+                commands.add(new ChangePropertyCommand(selection, tag.getKey(), tag.getValue()));
         }
 
@@ -76 +72 @@
         if (getLayerManager().getEditDataSet() == null) {
             setEnabled(false);
-            if (selectionBuf != null)
-                selectionBuf.clear();
+            selectionBuf.clear();
+            tagsToPaste = EmptyTags;
         } else
             updateEnabledState(getLayerManager().getEditDataSet().getSelected());
@@ -84 +80 @@
     @Override
     protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        // selection changed => check if selection is completely different from before
-        boolean foundOld = false;
-        if (selection != null) {
-            for (OsmPrimitive p : selectionBuf) {
-                if (selection.contains(p)) {
-                    foundOld = true;
-                    break;
-                }
-            }
-            selectionBuf.clear();
-            selectionBuf.addAll(selection);
-        } else {
-            foundOld = selectionBuf.isEmpty();
-            selectionBuf.clear();
-        }
-        if (!foundOld) {
-            // selection has completely changed, remember tags
-            tags.clear();
-            tags.putAll(currentTags);
-        }
-        if (getLayerManager().getEditDataSet() != null)
-            rememberSelectionTags();
+        TagCollection oldTags = getCommonTags(selectionBuf);
+        if (!oldTags.isEmpty()) {
+            tagsToPaste = new TagCollection(oldTags);
+        }
+        selectionBuf.clear();
+        selectionBuf.addAll(selection);
 
-        setEnabled(selection != null && !selection.isEmpty() && !tags.isEmpty());
+        setEnabled(!selection.isEmpty() && !tagsToPaste.isEmpty());
     }
 
-    private void rememberSelectionTags() {
-        // Fix #8350 - only care about tagged objects
-        final Collection<OsmPrimitive> selectedTaggedObjects = SubclassFilteredCollection.filter(
-                getLayerManager().getEditDataSet().getSelected(), IS_TAGGED_PREDICATE);
-        if (!selectedTaggedObjects.isEmpty()) {
-            currentTags.clear();
-            Set<String> bad = new HashSet<>();
-            for (OsmPrimitive p : selectedTaggedObjects) {
-                if (currentTags.isEmpty()) {
-                    for (String key : p.keySet()) {
-                        currentTags.put(key, p.get(key));
-                    }
-                } else {
-                    for (String key : p.keySet()) {
-                        if (!currentTags.containsKey(key) || !currentTags.get(key).equals(p.get(key)))
-                            bad.add(key);
-                    }
-                    for (String key : currentTags.keySet()) {
-                        if (!p.hasKey(key))
-                            bad.add(key);
-                    }
-                }
-            }
-            for (String key : bad) {
-                currentTags.remove(key);
-            }
-        }
+    /**
+     * Find those tags which appear in all primitives of the selection
+     * @param selection the selection
+     */
+    private static TagCollection getCommonTags(Set<OsmPrimitive> selection) {
+        if (selection.isEmpty())
+                return EmptyTags;
+//              // Fix #8350 - only care about tagged objects
+                return TagCollection.commonToAllPrimitives(SubclassFilteredCollection.filter(selection, p -> p.isTagged()));
     }
 }