MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (unwarranted lambdas)

Browse Source 
GitOrigin-RevId: de84119796baa82f48a26dcc7630245baa5d683a
This commit is contained in:
Roman Shevchenko
2019-05-11 00:05:56 +03:00
committed by intellij-monorepo-bot
parent af674d9d57
commit 5acf90956e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ClipboardSynchronizer.java
+3 -3
View File
@@ -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) {
platform/platform-impl/src/com/intellij/openapi/application/ex/ClipboardUtil.java
+3 -2
View File
@@ -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