From d677e278472f160fffd4eba9cf9e51439d288c1f Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 31 Dec 2012 14:48:17 +0100 Subject: [PATCH] EA-42376 - NPE: EditScopesAction.update --- .../com/intellij/ide/scopeView/EditScopesAction.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/EditScopesAction.java b/platform/lang-impl/src/com/intellij/ide/scopeView/EditScopesAction.java index 9d1d5379ab1f..8c992e4c1ef1 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/EditScopesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/EditScopesAction.java @@ -18,6 +18,7 @@ package com.intellij.ide.scopeView; import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.ProjectView; +import com.intellij.ide.projectView.impl.AbstractProjectViewPane; import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -60,9 +61,12 @@ public class EditScopesAction extends AnAction implements DumbAware { final DataContext dataContext = e.getDataContext(); final Project project = PlatformDataKeys.PROJECT.getData(dataContext); if (project != null) { - final String scopeName = ProjectView.getInstance(project).getCurrentProjectViewPane().getSubId(); - if (scopeName != null) { - e.getPresentation().setEnabled(true); + final AbstractProjectViewPane projectViewPane = ProjectView.getInstance(project).getCurrentProjectViewPane(); + if (projectViewPane != null) { + final String scopeName = projectViewPane.getSubId(); + if (scopeName != null) { + e.getPresentation().setEnabled(true); + } } } }