From 0a9c875608369ee04795bcd60d6b0e4a2b2c7bf7 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 28 Sep 2017 19:00:53 +0200
Subject: [PATCH] avoid 'null' string in version; cleanup to
 showAndGet(IDEA-CR-24915)

---
 .../com/intellij/jarRepository/JarRepositoryManager.java  | 4 +---
 .../openapi/roots/impl/IdeaProjectModelModifier.java      | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
index 8b2d826cbbb5..f6331553bc89 100644
--- a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
+++ b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
@@ -33,7 +33,6 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.NewLibraryConfiguration;
 import com.intellij.openapi.roots.libraries.ui.OrderRoot;
 import com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryEditor;
-import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Pair;
@@ -90,8 +89,7 @@ public class JarRepositoryManager {
   @Nullable
   public static NewLibraryConfiguration chooseLibraryAndDownload(final @NotNull Project project, final @Nullable String initialFilter, JComponent parentComponent) {
     RepositoryAttachDialog dialog = new RepositoryAttachDialog(project, initialFilter, RepositoryAttachDialog.Mode.DOWNLOAD);
-    dialog.show();
-    if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
+    if (!dialog.showAndGet()) {
       return null;
     }
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java b/java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java
index 3ff5c86fac64..f408f569915a 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java
@@ -19,11 +19,9 @@ import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar;
 import com.intellij.openapi.roots.libraries.LibraryUtil;
 import com.intellij.openapi.roots.libraries.ui.OrderRoot;
-import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.pom.java.LanguageLevel;
-import com.intellij.util.ObjectUtils;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -72,12 +70,12 @@ public class IdeaProjectModelModifier extends JavaProjectModelModifier {
       classesRoots = new LocateLibraryDialog(firstModule, defaultRoots, descriptor.getPresentableName()).showAndGetResult();
     }
     else {
+      String version = descriptor.getMinVersion();
       String mavenCoordinates = descriptor.getLibraryGroupId() + ":" +
                                 descriptor.getLibraryArtifactId() +
-                                ObjectUtils.notNull(":" + descriptor.getMinVersion(), "");
+                                (version != null ? ":" + version : "");
       RepositoryAttachDialog dialog = new RepositoryAttachDialog(myProject, mavenCoordinates, RepositoryAttachDialog.Mode.DOWNLOAD);
-      dialog.show();
-      if (dialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) {
+      if (!dialog.showAndGet()) {
         return Promises.rejectedPromise();
       }