From f09605dab81d28b84c2a4d874ec99502a9bc6368 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 5 Oct 2009 15:01:54 +0400 Subject: [PATCH] =?UTF-8?q?IDEADEV-40602:=20New=20module=20wizard:=20techn?= =?UTF-8?q?ologies=20page:=20libraries=20are=20downloaded=20even=20if=20th?= =?UTF-8?q?e=20setting=20is=20false=20(=E2=80=8Bregression)=20IDEA-24875:?= =?UTF-8?q?=20Project=20wizard:=20download=20libraries=20doesn=E2=80=8B'?= =?UTF-8?q?=E2=80=8Bt=20respect=20Maven=E2=80=8B-=E2=80=8Brepository=20URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddSupportForFrameworksPanel.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 a9d3397b7869..1335bca1fed6 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 @@ -110,13 +110,7 @@ public class AddSupportForFrameworksPanel { final FrameworkSupportNode selectedNode = getSelectedNode(); if (!Comparing.equal(selectedNode, myLastSelectedNode)) { - if (myLastSelectedNode != null) { - final LibraryCompositionOptionsPanel optionsPanel = myLastSelectedNode.getLibraryCompositionOptionsPanel(myLibrariesContainer, myMirrorsMap); - if (optionsPanel != null) { - optionsPanel.saveSelectedRepositoriesMirrors(myMirrorsMap); - optionsPanel.apply(); - } - } + applyLibraryOptionsForSelected(); myLastSelectedNode = selectedNode; if (selectedNode != null) { @@ -128,6 +122,16 @@ public class AddSupportForFrameworksPanel { } } + private void applyLibraryOptionsForSelected() { + if (myLastSelectedNode != null) { + final LibraryCompositionOptionsPanel optionsPanel = myLastSelectedNode.getLibraryCompositionOptionsPanel(myLibrariesContainer, myMirrorsMap); + if (optionsPanel != null) { + optionsPanel.saveSelectedRepositoriesMirrors(myMirrorsMap); + optionsPanel.apply(); + } + } + } + private void updateOptionsPanel() { final FrameworkSupportNode node = getSelectedNode(); if (node != null) { @@ -223,6 +227,7 @@ public class AddSupportForFrameworksPanel { } public boolean downloadLibraries() { + applyLibraryOptionsForSelected(); List list = getLibrariesCompositionSettingsList(); for (LibraryCompositionSettings compositionSettings : list) { if (!compositionSettings.downloadFiles(myMirrorsMap, myLibrariesContainer, myMainPanel)) return false;