From 12a2d193f41b63aaab84dd70bf42f48abf953e0c Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 12 Mar 2012 10:26:08 +0100 Subject: [PATCH] IDEA-82549 NPE at WindowManagerImpl.isFullScreen() on opening new project in current window if several IDEA windows are open --- .../src/com/intellij/openapi/wm/impl/IdeFrameImpl.java | 4 ++++ .../src/com/intellij/openapi/wm/impl/WindowManagerImpl.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java index ddb0d4f6ad93..248119431e3a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java @@ -455,6 +455,10 @@ public class IdeFrameImpl extends JFrame implements IdeFrame, DataProvider { return myBalloonLayout; } + public boolean isInFullScreen() { + return myFrameDecorator != null && myFrameDecorator.isInFullScreen(); + } + public void showWelcomeScreen() { myRootPane.showWelcomeScreen(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java index 9473f29fd0ee..20b67771d2ce 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java @@ -261,7 +261,7 @@ public final class WindowManagerImpl extends WindowManagerEx implements Applicat @Override public boolean isFullScreen(@NotNull Frame frame) { - return frame instanceof IdeFrameImpl && ((IdeFrameImpl)frame).getFrameDecorator().isInFullScreen(); + return frame instanceof IdeFrameImpl && ((IdeFrameImpl)frame).isInFullScreen(); } @Override