From 329ecc23924e4661b51e36e4f6693db75dff79f9 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 21 Dec 2020 00:26:59 +0100 Subject: [PATCH] remove deprecated members GitOrigin-RevId: eadaa9e0ae37c9a37ad1a4bbff5bab5e61228169 --- .../openapi/application/BaseActionRunnable.java | 17 ----------------- .../intellij/openapi/application/RunResult.java | 5 ++--- .../openapi/application/WriteAction.java | 5 +---- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java b/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java index 82771321bdb8..06bedeb45429 100644 --- a/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java +++ b/platform/core-api/src/com/intellij/openapi/application/BaseActionRunnable.java @@ -6,12 +6,6 @@ import com.intellij.util.ThrowableRunnable; import org.jetbrains.annotations.NotNull; public abstract class BaseActionRunnable { - private boolean mySilentExecution; - - public boolean isSilentExecution() { - return mySilentExecution; - } - protected abstract void run(@NotNull Result result) throws Throwable; /** @@ -23,15 +17,4 @@ public abstract class BaseActionRunnable { @Deprecated @NotNull public abstract RunResult execute(); - - /** - * Same as {@link #execute()}, but does not log an error if an exception occurs. - * @deprecated use {@link ReadAction#run(ThrowableRunnable)} or {@link WriteAction#run(ThrowableRunnable)} instead - */ - @Deprecated - @NotNull - public final RunResult executeSilently() { - mySilentExecution = true; - return execute(); - } } \ No newline at end of file diff --git a/platform/core-api/src/com/intellij/openapi/application/RunResult.java b/platform/core-api/src/com/intellij/openapi/application/RunResult.java index ad33c3347377..c23768ecd5a2 100644 --- a/platform/core-api/src/com/intellij/openapi/application/RunResult.java +++ b/platform/core-api/src/com/intellij/openapi/application/RunResult.java @@ -30,6 +30,7 @@ public final class RunResult extends Result { myActionRunnable = action; } + @NotNull public RunResult run() { try { myActionRunnable.run(this); @@ -39,9 +40,7 @@ public final class RunResult extends Result { } catch (Throwable t) { myThrowable = t; - if (!myActionRunnable.isSilentExecution()) { - ExceptionUtil.rethrowAllAsUnchecked(t); - } + ExceptionUtil.rethrowAllAsUnchecked(t); } finally { myActionRunnable = null; diff --git a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java index 57c318d749c8..5e72a534d0cb 100644 --- a/platform/core-api/src/com/intellij/openapi/application/WriteAction.java +++ b/platform/core-api/src/com/intellij/openapi/application/WriteAction.java @@ -59,10 +59,7 @@ public abstract class WriteAction extends BaseActionRunnable { } }); - if (!isSilentExecution()) { - result.throwException(); - } - + result.throwException(); return result; }