diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java index eccd2d3a32fd..9450408c18b5 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java @@ -90,10 +90,4 @@ public class NewModuleAction extends AnAction implements DumbAware { super.update(e); e.getPresentation().setEnabled(getProject(e) != null); } - - @Nullable - private static Project getProject(AnActionEvent e) { - return e.getData(PlatformDataKeys.PROJECT); - } - } diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryAction.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryAction.java index c59d39a24186..c9384f5bea62 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryAction.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/actions/LocalHistoryAction.java @@ -74,8 +74,4 @@ public abstract class LocalHistoryAction extends AnAction implements DumbAware { } return commonParent; } - - protected Project getProject(AnActionEvent e) { - return e.getData(PlatformDataKeys.PROJECT); - } } diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java index bbcea138302f..de5c19b73b33 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java @@ -18,10 +18,12 @@ package com.intellij.openapi.actionSystem; import com.intellij.openapi.Disposable; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.util.ArrayList; @@ -302,4 +304,9 @@ public abstract class AnAction { public interface TransparentUpdate { } + + @Nullable + public static Project getProject(AnActionEvent e) { + return e == null ? null : e.getData(PlatformDataKeys.PROJECT); + } } diff --git a/platform/platform-api/src/com/intellij/ui/switcher/ApplySwitchAction.java b/platform/platform-api/src/com/intellij/ui/switcher/ApplySwitchAction.java index c96de3a16e4d..c7f990fe445e 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/ApplySwitchAction.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/ApplySwitchAction.java @@ -48,9 +48,6 @@ public class ApplySwitchAction extends AnAction { } } - private static Project getProject(AnActionEvent e) { - return PlatformDataKeys.PROJECT.getData(e.getDataContext()); - } @Override public void actionPerformed(AnActionEvent e) { diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsAction.java b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsAction.java index 411441284f4b..7ce776f0586c 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsAction.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsAction.java @@ -30,8 +30,4 @@ public class ShowFeatureUsageStatisticsAction extends AnAction implements DumbAw super.update(e); e.getPresentation().setEnabled(getProject(e) != null); } - - private Project getProject(AnActionEvent e) { - return PlatformDataKeys.PROJECT.getData(e.getDataContext()); - } } \ No newline at end of file diff --git a/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java b/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java index c7037855449d..b6ddb4d72e99 100644 --- a/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java +++ b/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java @@ -73,10 +73,6 @@ public class SynchronizeCurrentFileAction extends AnAction implements DumbAware WindowManager.getInstance().getStatusBar(project).setInfo(message); } - private static Project getProject(AnActionEvent e) { - return e.getData(PlatformDataKeys.PROJECT); - } - private static VirtualFile[] getFiles(AnActionEvent e) { return e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java index a6fc5cf3da55..d4bfd1db5096 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java @@ -429,7 +429,7 @@ public class XLineBreakpointImpl
extends XBreak } public void actionPerformed(final AnActionEvent e) { - XDebuggerUtil.getInstance().removeBreakpoint(getProject(), XLineBreakpointImpl.this); + XDebuggerUtil.getInstance().removeBreakpoint(XLineBreakpointImpl.this.getProject(), XLineBreakpointImpl.this); } } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java index 83d9566f92ea..424f80b09b6a 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsGroup.java @@ -80,11 +80,6 @@ public class AssociationsGroup extends ActionGroup { return XsltSupport.isXsltFile(psiFile); } - @Nullable - static Project getProject(@Nullable AnActionEvent e) { - return e != null ? LangDataKeys.PROJECT.getData(e.getDataContext()) : null; - } - @Nullable static PsiFile getPsiFile(@Nullable AnActionEvent e) { return e != null ? LangDataKeys.PSI_FILE.getData(e.getDataContext()) : null;