diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java index ea88fa61c2b8..311bb86dc10d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/LibraryEditingUtil.java @@ -209,7 +209,9 @@ public class LibraryEditingUtil { return modules; } - public static void showDialogAndAddLibraryToDependencies(@NotNull Library library, @NotNull Project project) { - ProjectStructureValidator.showDialogAndAddLibraryToDependencies(library, project); + public static void showDialogAndAddLibraryToDependencies(@NotNull Library library, + @NotNull Project project, + boolean allowEmptySelection) { + ProjectStructureValidator.showDialogAndAddLibraryToDependencies(library, project, allowEmptySelection); } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java index 7234d5d64aa4..97fc071ea594 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/CreateNewLibraryAction.java @@ -71,7 +71,7 @@ public class CreateNewLibraryAction extends DumbAwareAction { final DefaultMutableTreeNode libraryNode = MasterDetailsComponent.findNodeByObject((TreeNode)rootConfigurable.getTree().getModel().getRoot(), library); rootConfigurable.selectNodeInTree(libraryNode); - LibraryEditingUtil.showDialogAndAddLibraryToDependencies(library, myProject); + LibraryEditingUtil.showDialogAndAddLibraryToDependencies(library, myProject, true); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddLibraryToModuleDependenciesAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddLibraryToModuleDependenciesAction.java index 5e32c46b4418..0340df7269c8 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddLibraryToModuleDependenciesAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/AddLibraryToModuleDependenciesAction.java @@ -54,6 +54,6 @@ public class AddLibraryToModuleDependenciesAction extends DumbAwareAction { final LibraryProjectStructureElement element = (LibraryProjectStructureElement)myConfigurable.getSelectedElement(); if (element == null) return; final Library library = element.getLibrary(); - LibraryEditingUtil.showDialogAndAddLibraryToDependencies(library, myProject); + LibraryEditingUtil.showDialogAndAddLibraryToDependencies(library, myProject, false); } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java index 3a07b8e6c312..46cf5bbf7c6e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/LibraryProjectStructureElement.java @@ -197,7 +197,7 @@ public class LibraryProjectStructureElement extends ProjectStructureElement { @Override public void performFix() { - LibraryEditingUtil.showDialogAndAddLibraryToDependencies(myLibrary, myContext.getProject()); + LibraryEditingUtil.showDialogAndAddLibraryToDependencies(myLibrary, myContext.getProject(), false); } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureValidator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureValidator.java index 8e093e9ac0f5..e7dc8f631487 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureValidator.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectStructureValidator.java @@ -55,9 +55,9 @@ public abstract class ProjectStructureValidator { element.check(problemsHolder); } - public static void showDialogAndAddLibraryToDependencies(final Library library, final Project project) { + public static void showDialogAndAddLibraryToDependencies(final Library library, final Project project, boolean allowEmptySelection) { for (ProjectStructureValidator validator : EP_NAME.getExtensions()) { - if (validator.addLibraryToDependencies(library, project)) { + if (validator.addLibraryToDependencies(library, project, allowEmptySelection)) { return; } } @@ -81,7 +81,7 @@ public abstract class ProjectStructureValidator { /** * @return true if handled */ - protected boolean addLibraryToDependencies(final Library library, final Project project) { + protected boolean addLibraryToDependencies(final Library library, final Project project, final boolean allowEmptySelection) { return false; }