From 5acf90956edc15ee030e8a1ba79a823ec2d69d13 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 10 May 2019 22:32:43 +0200
Subject: [PATCH] Cleanup (unwarranted lambdas)

GitOrigin-RevId: de84119796baa82f48a26dcc7630245baa5d683a
---
 .../src/com/intellij/ide/ClipboardSynchronizer.java         | 6 +++---
 .../com/intellij/openapi/application/ex/ClipboardUtil.java  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
index 08a129ecec8b..ab181f68478d 100644
--- a/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+++ b/platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
@@ -67,12 +67,12 @@ public class ClipboardSynchronizer implements Disposable {
   }
 
   public boolean areDataFlavorsAvailable(@NotNull DataFlavor... flavors) {
-    return ClipboardUtil.handleClipboardSafely(() -> myClipboardHandler.areDataFlavorsAvailable(flavors), () -> false);
+    return ClipboardUtil.handleClipboardSafely(() -> myClipboardHandler.areDataFlavorsAvailable(flavors), false);
   }
 
   @Nullable
   public Transferable getContents() {
-    return ClipboardUtil.handleClipboardSafely(myClipboardHandler::getContents, () -> null);
+    return ClipboardUtil.handleClipboardSafely(myClipboardHandler::getContents, null);
   }
 
   @Nullable
@@ -85,7 +85,7 @@ public class ClipboardSynchronizer implements Disposable {
         LOG.debug(e);
         return null;
       }
-    }, () -> null);
+    }, null);
   }
 
   public void setContent(@NotNull final Transferable content, @NotNull final ClipboardOwner owner) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ex/ClipboardUtil.java b/platform/platform-impl/src/com/intellij/openapi/application/ex/ClipboardUtil.java
index 5e4bdfb0570d..622544f342d0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/application/ex/ClipboardUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/application/ex/ClipboardUtil.java
@@ -13,7 +13,7 @@ import java.util.function.Supplier;
 public class ClipboardUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.ide.Clipboard");
 
-  public static <E> E handleClipboardSafely(@NotNull Supplier<? extends E> supplier, @NotNull Supplier<? extends E> onFail) {
+  public static <E> E handleClipboardSafely(@NotNull Supplier<? extends E> supplier, E defaultValue) {
     try {
       return supplier.get();
     }
@@ -31,7 +31,8 @@ public class ClipboardUtil {
     catch (IllegalArgumentException e) {
       LOG.warn("Java bug #7173464", e);
     }
-    return onFail.get();
+
+    return defaultValue;
   }
 
   @Nullable