Changeset 16436 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

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

Author:

simon04

Message:

see #19251 - Java 8: use Stream

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

@@ -18 +18 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import javax.swing.AbstractListModel;
@@ -369 +371 @@
 
     protected void alertCopyFailedForDeletedPrimitives(List<PrimitiveId> deletedIds) {
-        List<String> items = new ArrayList<>();
-        for (int i = 0; i < Math.min(MAX_DELETED_PRIMITIVE_IN_DIALOG, deletedIds.size()); i++) {
-            items.add(deletedIds.get(i).toString());
-        }
+        List<String> items = deletedIds.stream().limit(MAX_DELETED_PRIMITIVE_IN_DIALOG).map(Object::toString).collect(Collectors.toList());
         if (deletedIds.size() > MAX_DELETED_PRIMITIVE_IN_DIALOG) {
             items.add(tr("{0} more...", deletedIds.size() - MAX_DELETED_PRIMITIVE_IN_DIALOG));
@@ -422 +421 @@
         getMergedEntries().clear();
 
-        int[] rows = new int[entries.get(source).size()];
-        for (int i = 0; i < rows.length; i++) {
-            rows[i] = i;
-        }
+        int[] rows = IntStream.range(0, entries.get(source).size()).toArray();
         copy(source, rows, 0);
     }
@@ -588 +584 @@
      */
     protected boolean myAndTheirEntriesEqual() {
-        if (getMyEntriesSize() != getTheirEntriesSize())
-            return false;
-        for (int i = 0; i < getMyEntriesSize(); i++) {
-            if (!isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i)))
-                return false;
-        }
-        return true;
+        return getMyEntriesSize() == getTheirEntriesSize()
+                && IntStream.range(0, getMyEntriesSize()).allMatch(i -> isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i)));
     }