Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 12547)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 12549)
@@ -377,5 +377,5 @@
      */
     public boolean hasValuesFor(String key) {
-        return generateStreamForKey(key).filter(t -> !t.getValue().isEmpty()).findAny().isPresent();
+        return generateStreamForKey(key).anyMatch(t -> !t.getValue().isEmpty());
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 12547)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java	(revision 12549)
@@ -206,7 +206,6 @@
     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*/);
     }