Changeset 29672 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2013-06-20T02:28:28+02:00 (12 years ago)

Author:

donvip

Message:

[josm_utilsplugin2] fix #josm8350 - Copy tags from previous selection 'forgets' the tags when an untagged object is selected.

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java (modified) (2 diffs)

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

@@ -83 +83 @@
             tags.putAll(currentTags);
         }
-        rememberSelectionTags();
+        if( getCurrentDataSet() != null)
+            rememberSelectionTags();
 
         setEnabled(selection != null && !selection.isEmpty() && !tags.isEmpty());
@@ -89 +90 @@
 
     private void rememberSelectionTags() {
-        if( getCurrentDataSet() != null && !getCurrentDataSet().getSelected().isEmpty() ) {
+        // Fix #8350 - only care about tagged objects
+        Collection<OsmPrimitive> selectedTaggedObjects = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
+        for (Iterator<OsmPrimitive> it = selectedTaggedObjects.iterator(); it.hasNext(); ) {
+            if (!it.next().isTagged()) {
+                it.remove();
+            }
+        }
+        if( !selectedTaggedObjects.isEmpty() ) {
             currentTags.clear();
             Set<String> bad = new HashSet<String>();
-            for( OsmPrimitive p : getCurrentDataSet().getSelected() ) {
+            for( OsmPrimitive p : selectedTaggedObjects ) {
                 if( currentTags.isEmpty() ) {
                     for( String key : p.keySet() )