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

Timestamp:

2016-10-11T19:05:20+02:00 (8 years ago)

Author:

simon04

Message:

fix #13785 - Use streams, add unit tests (patch by alno, modified)

File:

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

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

@@ -226 +226 @@
         synchronized (listeners) {
             PropertyChangeEvent evt = new PropertyChangeEvent(this, FROZEN_PROP, oldValue, newValue);
-            for (PropertyChangeListener listener: listeners) {
+            listeners.forEach((listener) -> {
                 listener.propertyChange(evt);
+            });
             }
         }
-    }
 
     public final void setFrozen(boolean isFrozen) {
@@ -678 +678 @@
             if (row >= getEntries().size()) return false;
             T e1 = getEntries().get(row);
-            for (T e2: getOppositeEntries()) {
-                if (isEqualEntry(e1, e2)) return true;
+            return getOppositeEntries().stream().anyMatch(e2 -> isEqualEntry(e1, e2));
             }
-            return false;
-        }
 
         protected List<T> getEntries() {