mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEADEV-40607: Artifact editing actions should be dumb-aware
This commit is contained in:
+2
-1
@@ -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;
|
||||
|
||||
|
||||
+4
-2
@@ -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);
|
||||
|
||||
+2
-1
@@ -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) {
|
||||
|
||||
+4
-4
@@ -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) {
|
||||
|
||||
+8
-6
@@ -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) {
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
+2
-1
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user