Changeset 31653 in osm for applications/editors/josm/plugins/utilsplugin2

Timestamp:

2015-10-19T20:48:07+02:00 (9 years ago)

Author:

simon04

Message:

JOSM/utilsplugin2: Refactoring (use Utils.filter)

File:

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

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

@@ -5 +5 @@
 import java.util.*;
 import java.awt.event.KeyEvent;
+import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Shortcut;
 import java.awt.event.ActionEvent;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.tools.Utils;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -18 +20 @@
 public class TagBufferAction extends JosmAction {
     private static final String TITLE = tr("Copy tags from previous selection");
+    private static final Predicate<OsmPrimitive> IS_TAGGED_PREDICATE = new Predicate<OsmPrimitive>() {
+        @Override
+        public boolean evaluate(OsmPrimitive object) {
+            return object.isTagged();
+        }
+    };
     private Map<String, String> tags = new HashMap<>();
     private Map<String, String> currentTags = new HashMap<>();
@@ -94 +102 @@
     private void rememberSelectionTags() {
         // Fix #8350 - only care about tagged objects
-        Collection<OsmPrimitive> selectedTaggedObjects = new ArrayList<>(getCurrentDataSet().getSelected());
-        for (Iterator<OsmPrimitive> it = selectedTaggedObjects.iterator(); it.hasNext(); ) {
-            if (!it.next().isTagged()) {
-                it.remove();
-            }
-        }
+        final Collection<OsmPrimitive> selectedTaggedObjects = Utils.filter(getCurrentDataSet().getSelected(), IS_TAGGED_PREDICATE);
         if( !selectedTaggedObjects.isEmpty() ) {
             currentTags.clear();