From d9ef4bcd92e0943c4ee62bae8a8de4eedf81398d Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 19 Mar 2015 19:51:40 +0300
Subject: [PATCH] EA-66659 - NPE: IdeFrameImpl.getStatusBar

---
 .../src/com/intellij/ide/SwingCleanuper.java           | 10 +++-------
 .../src/com/intellij/openapi/wm/impl/IdeFrameImpl.java |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/SwingCleanuper.java b/platform/platform-impl/src/com/intellij/ide/SwingCleanuper.java
index baefe3db672d..6fd0cd8127f7 100644
--- a/platform/platform-impl/src/com/intellij/ide/SwingCleanuper.java
+++ b/platform/platform-impl/src/com/intellij/ide/SwingCleanuper.java
@@ -56,13 +56,9 @@ import java.util.EventListener;
 public final class SwingCleanuper implements ApplicationComponent{
   private final Alarm myAlarm;
 
-  /** Invoked by reflection
-   * @param projectManager   */
-  SwingCleanuper(ProjectManager projectManager){
-    myAlarm=new Alarm();
-
-    projectManager.addProjectManagerListener(
-      new ProjectManagerAdapter(){
+  public SwingCleanuper(Application application, ProjectManager projectManager) {
+    myAlarm = new Alarm(application);
+    projectManager.addProjectManagerListener(new ProjectManagerAdapter(){
         public void projectOpened(final Project project) {
           myAlarm.cancelAllRequests();
         }
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 f4357dbdc2d6..3dfbe464e517 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
@@ -260,7 +260,7 @@ public class IdeFrameImpl extends JFrame implements IdeFrameEx, DataProvider {
   }
 
   public StatusBar getStatusBar() {
-    return ((IdeRootPane)getRootPane()).getStatusBar();
+    return myRootPane == null ? null : myRootPane.getStatusBar();
   }
 
   public void setTitle(final String title) {