From 813ff28558cfc596b66d074c71f20dc814825511 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 26 Jul 2012 19:46:09 +0200 Subject: [PATCH] also ask for existing library replacement when configurable can do smth else --- .../impl/AddSupportForSingleFrameworkDialog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddSupportForSingleFrameworkDialog.java b/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddSupportForSingleFrameworkDialog.java index 5bba013d32d9..873ec9459189 100644 --- a/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddSupportForSingleFrameworkDialog.java +++ b/java/idea-ui/src/com/intellij/framework/addSupport/impl/AddSupportForSingleFrameworkDialog.java @@ -75,14 +75,14 @@ public class AddSupportForSingleFrameworkDialog extends DialogWrapper { protected void doOKAction() { final LibraryCompositionSettings librarySettings = myComponent.getLibraryCompositionSettings(); if (librarySettings != null) { - if (myConfigurable.isOnlyLibraryAdded()) { - final ModifiableRootModel modifiableModel = myModifiableModelsProvider.getModuleModifiableModel(myModule); - if (!askAndRemoveDuplicatedLibraryEntry(modifiableModel, librarySettings.getLibraryDescription())) { + final ModifiableRootModel modifiableModel = myModifiableModelsProvider.getModuleModifiableModel(myModule); + if (!askAndRemoveDuplicatedLibraryEntry(modifiableModel, librarySettings.getLibraryDescription())) { + if (myConfigurable.isOnlyLibraryAdded()) { myModifiableModelsProvider.disposeModuleModifiableModel(modifiableModel); return; } - myModifiableModelsProvider.commitModuleModifiableModel(modifiableModel); } + myModifiableModelsProvider.commitModuleModifiableModel(modifiableModel); final boolean downloaded = librarySettings.downloadFiles(getRootPane()); if (!downloaded) {