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

InternetAttachSourceProvider: display dialogs outside write action (EA-97211 - assert: NoSwingUnderWriteAction.lambda$watchForEvents$)

Browse Source
This commit is contained in:
peter
2017-02-18 19:28:38 +01:00
parent 1b8e9c30f8
commit 257ca8c157
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/jarFinder/InternetAttachSourceProvider.java
+16 -12
View File
@@ -193,21 +193,25 @@ public class InternetAttachSourceProvider extends AbstractAttachSourceProvider {
}
public static void attachSourceJar(@NotNull File sourceJar, @NotNull Collection<Library> libraries) {
VirtualFile srcFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(sourceJar);
if (srcFile == null) return;
VirtualFile jarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(srcFile);
if (jarRoot == null) return;
VirtualFile[] roots = LibrarySourceRootDetectorUtil.scanAndSelectDetectedJavaSourceRoots(null, new VirtualFile[]{jarRoot});
if (roots.length == 0) {
roots = new VirtualFile[]{jarRoot};
}
doAttachSourceJars(libraries, roots);
}
private static void doAttachSourceJars(@NotNull Collection<Library> libraries, VirtualFile[] roots) {
WriteAction.run(() -> {
VirtualFile srcFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(sourceJar);
if (srcFile == null) return;
VirtualFile jarRoot = JarFileSystem.getInstance().getJarRootForLocalFile(srcFile);
if (jarRoot == null) return;
VirtualFile[] roots = LibrarySourceRootDetectorUtil.scanAndSelectDetectedJavaSourceRoots(null, new VirtualFile[]{jarRoot});
if (roots.length == 0) {
roots = new VirtualFile[]{jarRoot};
}
for (Library library : libraries) {
Library.ModifiableModel model = library.getModifiableModel();
List<VirtualFile> alreadyExistingFiles = Arrays.asList(model.getFiles(OrderRootType.SOURCES));
Set<VirtualFile> alreadyExistingFiles = ContainerUtil.newHashSet(model.getFiles(OrderRootType.SOURCES));
for (VirtualFile root : roots) {
if (!alreadyExistingFiles.contains(root)) {