From ff1482ab93a6d6938ce0a78ef917c1255e00cbae Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 19 Sep 2011 16:47:27 +0200 Subject: [PATCH] Disable annoying assertion --- .../src/com/intellij/openapi/wm/impl/FocusManagerImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java index b14e506a37ac..2b38486eac81 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java @@ -800,7 +800,7 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable { @Override public Component getFocusOwner() { - //assertDispatchThread(); // todo: uncomment after IDEA 11 EAP + assertDispatchThread(); Component result = null; if (myRunContext != null) { @@ -1039,7 +1039,7 @@ public class FocusManagerImpl extends IdeFocusManager implements Disposable { return myApp.isActive() || !Registry.is("actionSystem.suspendFocusTransferIfApplicationInactive"); } - private void assertDispatchThread() { - ApplicationManager.getApplication().assertIsDispatchThread(); + private static void assertDispatchThread() { + //ApplicationManager.getApplication().assertIsDispatchThread(); // todo: uncomment after IDEA 11 EAP } }