Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2020-05-17T12:08:17+02:00 (5 years ago)

Author:

simon04

Message:

see #19251 - Java 8: use Stream

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• AddPrimitivesCommand.java (modified) (3 diffs)
• ChangePropertyCommand.java (modified) (1 diff)
• DeleteCommand.java (modified) (4 diffs)
• PurgeCommand.java (modified) (4 diffs)
• conflict/TagConflictResolveCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -20 +19 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.JosmRuntimeException;
 
 /**
@@ -160 +158 @@
             return createdPrimitives;
 
-        Collection<OsmPrimitive> prims = new HashSet<>();
-        for (PrimitiveData d : data) {
-            prims.add(Optional.ofNullable(getAffectedDataSet().getPrimitiveById(d)).orElseThrow(
-                    () -> new JosmRuntimeException("No primitive found for " + d)));
-        }
-        return prims;
+        return data.stream()
+                .map(d -> Objects.requireNonNull(getAffectedDataSet().getPrimitiveById(d), () -> "No primitive found for " + d))
+                .collect(Collectors.toSet());
     }
 

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -229 +229 @@
             }
         } else {
-            boolean allnull = true;
-            for (Map.Entry<String, String> tag : this.tags.entrySet()) {
-                if (tag.getValue() != null && !tag.getValue().isEmpty()) {
-                    allnull = false;
-                    break;
-                }
-            }
-
-            if (allnull) {
+            boolean allNull = this.tags.entrySet().stream()
+                    .allMatch(tag -> tag.getValue() == null || tag.getValue().isEmpty());
+
+            if (allNull) {
                 /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */
                 text = trn("Deleted {0} tags for {1} object", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -224 +223 @@
     }
 
-    private EnumSet<OsmPrimitiveType> getTypesToDelete() {
-        EnumSet<OsmPrimitiveType> typesToDelete = EnumSet.noneOf(OsmPrimitiveType.class);
-        for (OsmPrimitive osm : toDelete) {
-            typesToDelete.add(OsmPrimitiveType.from(osm));
-        }
-        return typesToDelete;
+    private Set<OsmPrimitiveType> getTypesToDelete() {
+        return toDelete.stream().map(OsmPrimitiveType::from).collect(Collectors.toSet());
     }
 
@@ -278 +273 @@
             return null;
         else {
-            List<PseudoCommand> children = new ArrayList<>(toDelete.size());
-            for (final OsmPrimitive osm : toDelete) {
-                children.add(new DeleteChildCommand(osm));
-            }
-            return children;
-
+            return toDelete.stream().map(DeleteChildCommand::new).collect(Collectors.toList());
         }
     }
@@ -369 +359 @@
                 Collection<OsmPrimitive> referringPrimitives = n.getReferrers();
                 referringPrimitives.removeAll(primitivesToDelete);
-                int count = 0;
-                for (OsmPrimitive p : referringPrimitives) {
-                    if (!p.isDeleted()) {
-                        count++;
-                    }
-                }
-                if (count == 0) {
+                if (referringPrimitives.stream().allMatch(OsmPrimitive::isDeleted)) {
                     nodesToDelete.add(n);
                 }

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -13 +13 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.swing.Icon;
@@ -26 +27 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationData;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Storage;
 import org.openstreetmap.josm.data.osm.Way;
@@ -222 +222 @@
             }
         }
-        Set<Relation> childlessR = new HashSet<>();
-        for (Relation r : inR) {
-            if (numChilds.get(r).equals(0)) {
-                childlessR.add(r);
-            }
-        }
+        Set<Relation> childlessR = inR.stream().filter(r -> numChilds.get(r).equals(0)).collect(Collectors.toSet());
 
         List<Relation> outR = new ArrayList<>(inR.size());
@@ -409 +404 @@
     private static boolean hasOnlyIncompleteMembers(
             Relation r, Collection<OsmPrimitive> toPurge, Collection<? extends OsmPrimitive> moreToPurge) {
-        for (RelationMember m : r.getMembers()) {
-            if (!m.getMember().isIncomplete() && !toPurge.contains(m.getMember()) && !moreToPurge.contains(m.getMember()))
-                return false;
-        }
-        return true;
+        return r.getMembers().stream()
+                .allMatch(m -> m.getMember().isIncomplete() || toPurge.contains(m.getMember()) || moreToPurge.contains(m.getMember()));
     }
 }

trunk/src/org/openstreetmap/josm/command/conflict/TagConflictResolveCommand.java

@@ -34 +34 @@
      */
     public int getNumDecidedConflicts() {
-        int n = 0;
-        for (TagMergeItem item: mergeItems) {
-            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
-                n++;
-            }
-        }
-        return n;
+        return (int) mergeItems.stream().filter(item -> item.getMergeDecision() != MergeDecisionType.UNDECIDED).count();
     }