From fd13482f35a13ba29a23f95911c07a357607bd6c Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Wed, 17 Aug 2016 12:48:18 +0300 Subject: [PATCH] IDEA-158073 'Download sources' link should open source file after download --- .../maven/project/MavenArtifactDownloader.java | 1 + .../utils/MavenAttachSourcesProvider.java | 18 ------------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java index b6648eca8622..e47d65a3909f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java @@ -105,6 +105,7 @@ public class MavenArtifactDownloader { Set parentsToRefresh = new HashSet<>(); // We have to refresh parents of downloaded files, because some additional files may have been download. for (File file : downloadedFiles) { + parentsToRefresh.add(file); parentsToRefresh.add(file.getParentFile()); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java index 3ee175d4bead..730a68bcc050 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java @@ -22,15 +22,11 @@ import com.intellij.notification.Notifications; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.LibraryOrderEntry; import com.intellij.openapi.roots.OrderEntry; -import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.AsyncResult; -import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.psi.PsiFile; import com.intellij.util.Consumer; -import com.intellij.util.PathUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.importing.MavenRootModelAdapter; @@ -41,13 +37,10 @@ import org.jetbrains.idea.maven.project.MavenProject; import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.project.ProjectBundle; -import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; public class MavenAttachSourcesProvider implements AttachSourcesProvider { @Override @@ -115,17 +108,6 @@ public class MavenAttachSourcesProvider implements AttachSourcesProvider { resultWrapper.setRejected(); } else { - List files = orderEntries.stream() - .flatMap(entry -> entry.getLibrary() != null ? - Stream.of(entry.getLibrary().getUrls(OrderRootType.SOURCES)) : - Stream.empty()) - .distinct() - .map(url -> new File(PathUtil.getLocalPath(VfsUtilCore.urlToPath(url)))) - .collect(Collectors.toList()); - - if(!files.isEmpty()) { - LocalFileSystem.getInstance().refreshIoFiles(files, true, false, null); - } resultWrapper.setDone(); } }