Changeset 12549 in josm for trunk

Timestamp:

2017-07-31T23:34:29+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S4034 - "Stream.anyMatch()" should be preferred

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/TagCollection.java (modified) (1 diff)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -377 +377 @@
      */
     public boolean hasValuesFor(String key) {
-        return generateStreamForKey(key).filter(t -> !t.getValue().isEmpty()).findAny().isPresent();
+        return generateStreamForKey(key).anyMatch(t -> !t.getValue().isEmpty());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -206 +206 @@
     private boolean containsDataKey(String key) {
         return IntStream.range(0, tagData.getRowCount())
-                .filter(i -> key.equals(tagData.getValueAt(i, 0)) /* sic! do not use getDataKey*/
-                    && !((Map<String, Integer>) tagData.getValueAt(i, 1)).containsKey("") /* sic! do not use getDataValues*/)
-                .findAny().isPresent();
+                .anyMatch(i -> key.equals(tagData.getValueAt(i, 0)) /* sic! do not use getDataKey*/
+                    && !((Map<String, Integer>) tagData.getValueAt(i, 1)).containsKey("") /* sic! do not use getDataValues*/);
     }