From 2391f985b4ff596bbbb92bee2e5b7fc1101fc44a Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Sat, 28 Jul 2012 14:41:20 +0400
Subject: [PATCH] EA-37161

---
 .../designer/designSurface/AndroidDesignerEditorPanel.java  | 4 ++--
 .../designer/designSurface/ExternalPSIChangeListener.java   | 2 +-
 .../designer/designSurface/DesignerEditorPanel.java         | 6 +++++-
 .../designer/designSurface/ExternalPSIChangeListener.java   | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
index d9e7b0e9e167..290a88d53741 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java
@@ -112,7 +112,7 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
     myProfileAction = new ProfileAction(this, new Runnable() {
       @Override
       public void run() {
-        if (getProject().isDisposed()) {
+        if (isProjectClosed()) {
           return;
         }
         myPSIChangeListener.setInitialize();
@@ -303,7 +303,7 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel {
             @Override
             public void run() {
               try {
-                if (!getProject().isDisposed()) {
+                if (!isProjectClosed()) {
                   hideProgress();
                   runnable.consume(session);
                 }
diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
index 536060dff4a6..aa1f52493c75 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/ExternalPSIChangeListener.java
@@ -36,7 +36,7 @@ public class ExternalPSIChangeListener extends com.intellij.designer.designSurfa
   public void deactivate() {
     super.deactivate();
 
-    if (!myDesigner.getProject().isDisposed()) {
+    if (!myDesigner.isProjectClosed()) {
       myResourceDepends = AndroidFacet.getInstance(myDesigner.getModule()).getLocalResourceManager().getAllResourceDirs();
     }
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index 2ad949679875..89ac58cb12b5 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -363,7 +363,7 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
   }
 
   public final void showError(@NotNull String message, @NotNull Throwable e) {
-    if (getProject().isDisposed()) {
+    if (isProjectClosed()) {
       return;
     }
 
@@ -540,6 +540,10 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
     return myProject;
   }
 
+  public final boolean isProjectClosed() {
+    return myProject.isDisposed() || !myProject.isOpen();
+  }
+
   public EditableArea getSurfaceArea() {
     return mySurfaceArea;
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
index 423c7a2c65f4..90a0583699e5 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/ExternalPSIChangeListener.java
@@ -102,7 +102,7 @@ public class ExternalPSIChangeListener extends PsiTreeChangeAdapter {
     myAlarm.addRequest(new Runnable() {
       @Override
       public void run() {
-        if (myRunState && myInitialize && !myDesigner.getProject().isDisposed()) {
+        if (myRunState && myInitialize && !myDesigner.isProjectClosed()) {
           runnable.run();
         }
       }