MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-115398 New Project Wizard: libraries downloading doesn't work

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-11-07 10:12:26 +04:00
parent 3d251be503
commit f510156c71
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
+9 -10
View File
@@ -253,7 +253,7 @@ public class AddSupportForFrameworksPanel implements Disposable {
private List<LibraryCompositionSettings> getLibrariesCompositionSettingsList() {
List<LibraryCompositionSettings> list = new ArrayList<LibraryCompositionSettings>();
List<FrameworkSupportNode> selected = getFrameworkNodes(true);
List<FrameworkSupportNode> 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<FrameworkSupportNode> getFrameworkNodes(final boolean selectedOnly) {
private List<FrameworkSupportNode> getSelectedNodes() {
List<FrameworkSupportNode> list = new ArrayList<FrameworkSupportNode>();
if (myRoots != null) {
addChildFrameworks(myRoots, list, selectedOnly);
addChildFrameworks(myRoots, list);
}
list.addAll(ContainerUtil.mapNotNull(myAssociatedFrameworks, new Function.InstanceOf<FrameworkSupportNodeBase, FrameworkSupportNode>(FrameworkSupportNode.class)));
return list;
}
private static void addChildFrameworks(final List<FrameworkSupportNodeBase> list, final List<FrameworkSupportNode> result,
final boolean selectedOnly) {
private static void addChildFrameworks(final List<FrameworkSupportNodeBase> list, final List<FrameworkSupportNode> 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<Library> addedLibraries = new ArrayList<Library>();
List<FrameworkSupportNode> selectedFrameworks = getFrameworkNodes(true);
selectedFrameworks.addAll(ContainerUtil.mapNotNull(myAssociatedFrameworks, new Function.InstanceOf<FrameworkSupportNodeBase, FrameworkSupportNode>(FrameworkSupportNode.class)));
List<FrameworkSupportNode> selectedFrameworks = getSelectedNodes();
sortFrameworks(selectedFrameworks);
List<FrameworkSupportConfigurable> selectedConfigurables = new ArrayList<FrameworkSupportConfigurable>();
final IdeaModifiableModelsProvider modifiableModelsProvider = new IdeaModifiableModelsProvider();