This commit is contained in:
Alexander Lobas
2012-07-28 14:41:20 +04:00
parent 961ec7aa1d
commit 2391f985b4
4 changed files with 9 additions and 5 deletions
@@ -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);
}
@@ -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();
}
}
@@ -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;
}
@@ -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();
}
}