Changeset 16326 in josm for trunk/src/org

Timestamp:

2020-04-17T21:27:31+02:00 (5 years ago)

Author:

simon04

Message:

Java 8: use Stream.anyMatch

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer

Files:

• AbstractStackTransferHandler.java (modified) (1 diff)
• OsmTransferHandler.java (modified) (1 diff)
• PrimitiveTransferable.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/datatransfer/AbstractStackTransferHandler.java

@@ -35 +35 @@
     public boolean canImport(TransferSupport support) {
         // import everything for now, only support copy.
-        for (AbstractOsmDataPaster df : getSupportedPasters()) {
-            if (df.supports(support)) {
-                return true;
-            }
-        }
-        return false;
+        return getSupportedPasters().stream()
+                .anyMatch(df -> df.supports(support));
     }
 

trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java

@@ -91 +91 @@
         try {
             Collection<DataFlavor> available = Arrays.asList(ClipboardUtils.getClipboard().getAvailableDataFlavors());
-            for (AbstractOsmDataPaster s : SUPPORTED) {
-                if (s.supports(available)) {
-                    return true;
-                }
-            }
+            return SUPPORTED.stream()
+                    .anyMatch(s -> s.supports(available));
         } catch (IllegalStateException e) {
             Logging.debug(e);

trunk/src/org/openstreetmap/josm/gui/datatransfer/PrimitiveTransferable.java

@@ -62 +62 @@
     public boolean isDataFlavorSupported(DataFlavor flavor) {
         DataFlavor[] flavors = getTransferDataFlavors();
-        for (DataFlavor f : flavors) {
-            if (flavor.equals(f)) {
-                return true;
-            }
-        }
-        return false;
+        return Arrays.stream(flavors)
+                .anyMatch(flavor::equals);
     }