From da2374a0b6fc0f28a6c0e24e77aba0bb1ed3592e Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 7 Mar 2014 11:31:11 +0400 Subject: [PATCH] if facet has associated framework show 'add facet' instead of 'add framework support' dialog in Project Structure (IDEA-120643, IDEA-113833) --- .../facet/impl/ui/actions/AddFacetToModuleAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java index 6e82be2ccbb1..1b17fc7aa8cd 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/actions/AddFacetToModuleAction.java @@ -100,14 +100,14 @@ public class AddFacetToModuleAction extends AnAction implements DumbAware { public static Collection createAddFrameworkActions(FacetEditorFacade editor, Project project) { SortedMap actions = new TreeMap(); - for (FacetType type : FacetTypeRegistry.getInstance().getFacetTypes()) { - actions.put(type.getPresentableName(), new AddFacetToModuleAction(editor, project, type)); - } for (FrameworkTypeEx frameworkType : FrameworkTypeEx.EP_NAME.getExtensions()) { - final AnAction action = new AddFrameworkSupportInProjectStructureAction(frameworkType, frameworkType.createProvider(), + final AnAction action = new AddFrameworkSupportInProjectStructureAction(frameworkType, frameworkType.createProvider(), ModuleStructureConfigurable.getInstance(project)); actions.put(frameworkType.getPresentableName(), action); } + for (FacetType type : FacetTypeRegistry.getInstance().getFacetTypes()) { + actions.put(type.getPresentableName(), new AddFacetToModuleAction(editor, project, type)); + } return actions.values(); } }