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

avoid 'null' string in version; cleanup to showAndGet(IDEA-CR-24915)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-09-28 19:35:39 +02:00
parent 2d1affbc0e
commit 0a9c875608
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java
+1 -3
View File
@@ -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;
}
java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java
+3 -5
View File
@@ -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();
}