From 64438d55edc4010d585fe08c7b29b6c2b5ad0583 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 19 Feb 2020 11:19:26 +0100 Subject: [PATCH] fix setAvailable GitOrigin-RevId: d5ba8c127e077e291507536ca8439725cd0dffaa --- .../src/com/intellij/openapi/wm/ToolWindow.java | 4 +--- .../openapi/wm/impl/ToolWindowHeadlessManagerImpl.java | 4 ++++ .../src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindow.java b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindow.java index f4a5f96fb03f..cf3c6f82ccda 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/ToolWindow.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/ToolWindow.java @@ -164,9 +164,7 @@ public interface ToolWindow extends BusyObject { */ void setAvailable(boolean value, @Nullable Runnable runnable); - default void setAvailable(boolean value) { - setAvailable(value, null); - } + void setAvailable(boolean value); void setContentUiType(@NotNull ToolWindowContentUiType type, @Nullable Runnable runnable); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java index caf9796c70ea..d56abc91ef5d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java @@ -356,6 +356,10 @@ public final class ToolWindowHeadlessManagerImpl extends ToolWindowManagerEx { public void setAvailable(boolean available, @Nullable Runnable runnable) { } + @Override + public void setAvailable(boolean value) { + } + @Override public void installWatcher(ContentManager contentManager) { } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt index bcc69487cf08..f5ddb183d7d2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt @@ -307,16 +307,16 @@ internal class ToolWindowImpl(val toolWindowManager: ToolWindowManagerImpl, } override fun setAvailable(value: Boolean) { - isAvailable = value - } - - override fun setAvailable(value: Boolean, runnable: Runnable?) { EDT.assertIsEdt() if (isAvailable != value) { isAvailable = value toolWindowManager.toolWindowPropertyChanged(this, ToolWindowProperty.AVAILABLE) } + } + + override fun setAvailable(value: Boolean, runnable: Runnable?) { + setAvailable(value) callLater(runnable) }