diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java index 26571042d3df..845ff186f113 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java @@ -253,7 +253,7 @@ public class AddSupportForFrameworksPanel implements Disposable { private List getLibrariesCompositionSettingsList() { List list = new ArrayList(); - List selected = getFrameworkNodes(true); + List selected = getSelectedNodes(); for (FrameworkSupportNode node : selected) { ContainerUtil.addIfNotNull(list, getLibraryCompositionSettings(node)); } @@ -349,34 +349,33 @@ public class AddSupportForFrameworksPanel implements Disposable { } public boolean hasSelectedFrameworks() { - return !getFrameworkNodes(true).isEmpty(); + return !getSelectedNodes().isEmpty(); } - private List getFrameworkNodes(final boolean selectedOnly) { + private List getSelectedNodes() { List list = new ArrayList(); if (myRoots != null) { - addChildFrameworks(myRoots, list, selectedOnly); + addChildFrameworks(myRoots, list); } + list.addAll(ContainerUtil.mapNotNull(myAssociatedFrameworks, new Function.InstanceOf(FrameworkSupportNode.class))); return list; } - private static void addChildFrameworks(final List list, final List result, - final boolean selectedOnly) { + private static void addChildFrameworks(final List list, final List result) { for (FrameworkSupportNodeBase node : list) { - if (!selectedOnly || node.isChecked() || node instanceof FrameworkGroupNode) { + if (node.isChecked() || node instanceof FrameworkGroupNode) { if (node instanceof FrameworkSupportNode) { result.add((FrameworkSupportNode)node); } //noinspection unchecked - addChildFrameworks(node.getChildren(), result, selectedOnly); + addChildFrameworks(node.getChildren(), result); } } } public void addSupport(final @NotNull Module module, final @NotNull ModifiableRootModel rootModel) { List addedLibraries = new ArrayList(); - List selectedFrameworks = getFrameworkNodes(true); - selectedFrameworks.addAll(ContainerUtil.mapNotNull(myAssociatedFrameworks, new Function.InstanceOf(FrameworkSupportNode.class))); + List selectedFrameworks = getSelectedNodes(); sortFrameworks(selectedFrameworks); List selectedConfigurables = new ArrayList(); final IdeaModifiableModelsProvider modifiableModelsProvider = new IdeaModifiableModelsProvider();