From 2160679e3610d424de73581710a9df149f301b8a Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 2 Oct 2009 15:38:15 +0400 Subject: [PATCH] =?utf8?q?IDEADEV-40607:=20Artifact=20editing=20actions=20?= =?utf8?q?should=20be=20dumb=E2=80=8B-=E2=80=8Baware?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../artifacts/AddCompositeElementActionGroup.java | 3 ++- .../artifacts/AddPackagingElementActionGroup.java | 6 ++++-- .../artifacts/ArtifactsStructureConfigurable.java | 3 ++- .../artifacts/actions/ArtifactEditorNavigateAction.java | 8 ++++---- .../artifacts/actions/ExtractArtifactAction.java | 14 ++++++++------ .../configuration/artifacts/actions/HideContentAction.java | 4 ++-- .../artifacts/actions/InlineArtifactAction.java | 4 ++-- .../configuration/artifacts/actions/MoveElementAction.java | 4 ++-- .../artifacts/actions/RemovePackagingElementAction.java | 4 ++-- .../artifacts/actions/RenamePackagingElementAction.java | 4 ++-- .../artifacts/actions/SortElementsToggleAction.java | 3 ++- 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java index 6cdd0b3e7c..4de13bd01c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddCompositeElementActionGroup.java @@ -2,6 +2,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; import com.intellij.packaging.elements.CompositePackagingElementType; import com.intellij.packaging.elements.PackagingElementFactory; @@ -11,7 +12,7 @@ import java.util.List; /** * @author nik */ -public class AddCompositeElementActionGroup extends AnAction { +public class AddCompositeElementActionGroup extends DumbAwareAction { private final ArtifactEditorEx myArtifactEditor; private final CompositePackagingElementType myElementType; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java index 61550c4ead..7fb47e0e76 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/AddPackagingElementActionGroup.java @@ -3,6 +3,8 @@ package com.intellij.openapi.roots.ui.configuration.artifacts; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAware; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; import com.intellij.packaging.elements.PackagingElementFactory; import com.intellij.packaging.elements.PackagingElementType; @@ -16,7 +18,7 @@ import java.util.List; /** * @author nik */ -public class AddPackagingElementActionGroup extends ActionGroup { +public class AddPackagingElementActionGroup extends ActionGroup implements DumbAware { private final ArtifactEditorEx myArtifactEditor; public AddPackagingElementActionGroup(ArtifactEditorEx artifactEditor) { @@ -34,7 +36,7 @@ public class AddPackagingElementActionGroup extends ActionGroup { for (final PackagingElementType type : types) { if (!type.canCreate(myArtifactEditor.getContext(), myArtifactEditor.getArtifact())) continue; - final AnAction action = new AnAction(type.getPresentableName()) { + final AnAction action = new DumbAwareAction(type.getPresentableName()) { @Override public void actionPerformed(AnActionEvent e) { myArtifactEditor.addNewPackagingElement(type); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java index dc4fd8391a..28f3f3e03e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java @@ -7,6 +7,7 @@ import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ui.configuration.projectRoot.BaseStructureConfigurable; @@ -163,7 +164,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable { } - private class AddArtifactAction extends AnAction { + private class AddArtifactAction extends DumbAwareAction { private final ArtifactType myType; public AddArtifactAction(ArtifactType type) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java index 314c81c5ad..d5c6e45876 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ArtifactEditorNavigateAction.java @@ -1,16 +1,16 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonShortcuts; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; -import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; +import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; /** * @author nik */ -public class ArtifactEditorNavigateAction extends AnAction { +public class ArtifactEditorNavigateAction extends DumbAwareAction { private LayoutTreeComponent myLayoutTreeComponent; public ArtifactEditorNavigateAction(LayoutTreeComponent layoutTreeComponent) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java index b5a23ab73d..408fb1f180 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/ExtractArtifactAction.java @@ -1,17 +1,19 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.project.ProjectBundle; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.roots.ui.configuration.artifacts.*; +import com.intellij.openapi.project.ProjectBundle; +import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; +import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; +import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection; import com.intellij.openapi.ui.Messages; -import com.intellij.packaging.artifacts.ModifiableArtifact; import com.intellij.packaging.artifacts.ArtifactPointerManager; +import com.intellij.packaging.artifacts.ModifiableArtifact; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.elements.PackagingElement; -import com.intellij.packaging.impl.artifacts.PlainArtifactType; import com.intellij.packaging.impl.artifacts.ArtifactUtil; +import com.intellij.packaging.impl.artifacts.PlainArtifactType; import com.intellij.packaging.impl.elements.ArtifactPackagingElement; import java.util.Collection; @@ -19,7 +21,7 @@ import java.util.Collection; /** * @author nik */ -public class ExtractArtifactAction extends AnAction { +public class ExtractArtifactAction extends DumbAwareAction { private ArtifactEditorEx myEditor; public ExtractArtifactAction(ArtifactEditorEx editor) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java index 993e9b845e..1681e5d95e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/HideContentAction.java @@ -1,7 +1,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; @@ -12,7 +12,7 @@ import java.util.Collection; /** * @author nik */ -public class HideContentAction extends AnAction { +public class HideContentAction extends DumbAwareAction { private ArtifactEditorEx myArtifactEditor; public HideContentAction(ArtifactEditorEx artifactEditor) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java index 1b0b99ecec..06f420e88c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/InlineArtifactAction.java @@ -1,7 +1,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; @@ -18,7 +18,7 @@ import com.intellij.packaging.ui.ArtifactEditorContext; /** * @author nik */ -public class InlineArtifactAction extends AnAction { +public class InlineArtifactAction extends DumbAwareAction { private final ArtifactEditorEx myEditor; public InlineArtifactAction(ArtifactEditorEx editor) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java index 7fa7085d53..d778cd6dd5 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/MoveElementAction.java @@ -1,7 +1,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.CompositePackagingElementNode; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; @@ -15,7 +15,7 @@ import java.util.List; /** * @author nik */ -public class MoveElementAction extends AnAction { +public class MoveElementAction extends DumbAwareAction { private final LayoutTreeComponent myLayoutTreeComponent; private final int myDirection; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java index 1336fd0986..9c30d7d215 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java @@ -1,7 +1,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; import com.intellij.util.Icons; @@ -9,7 +9,7 @@ import com.intellij.util.Icons; /** * @author nik */ -public class RemovePackagingElementAction extends AnAction { +public class RemovePackagingElementAction extends DumbAwareAction { private final ArtifactEditorEx myArtifactEditor; public RemovePackagingElementAction(ArtifactEditorEx artifactEditor) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java index 46cc7cc7a2..524059c775 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RenamePackagingElementAction.java @@ -1,8 +1,8 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; -import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; +import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection; @@ -15,7 +15,7 @@ import javax.swing.tree.TreePath; /** * @author nik */ -public class RenamePackagingElementAction extends AnAction { +public class RenamePackagingElementAction extends DumbAwareAction { private final ArtifactEditorEx myArtifactEditor; public RenamePackagingElementAction(ArtifactEditorEx artifactEditor) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java index c8ffc4cdb9..e7303ea397 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java @@ -2,13 +2,14 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.actions; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; +import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent; import com.intellij.openapi.util.IconLoader; /** * @author nik */ -public class SortElementsToggleAction extends ToggleAction { +public class SortElementsToggleAction extends ToggleAction implements DumbAware { private LayoutTreeComponent myLayoutTreeComponent; public SortElementsToggleAction(final LayoutTreeComponent layoutTreeComponent) { -- 2.11.4.GIT