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

[ui] fixes "Attach sources" chooser cancellation (IDEA-153651)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-03-30 17:02:51 +02:00
parent 6cc002d3ba
commit 31621dd672
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java
+6 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -178,10 +178,9 @@ public class AttachSourcesNotificationProvider extends EditorNotifications.Provi
@Nullable
private static String getClassFileInfo(VirtualFile file) {
try {
byte[] data = file.contentsToByteArray();
byte[] data = file.contentsToByteArray(false);
if (data.length > 8) {
DataInputStream stream = new DataInputStream(new ByteArrayInputStream(data));
try {
try (DataInputStream stream = new DataInputStream(new ByteArrayInputStream(data))) {
if (stream.readInt() == 0xCAFEBABE) {
int minor = stream.readUnsignedShort();
int major = stream.readUnsignedShort();
@@ -191,9 +190,6 @@ public class AttachSourcesNotificationProvider extends EditorNotifications.Provi
return info.toString();
}
}
finally {
stream.close();
}
}
}
catch (IOException ignored) { }
@@ -305,10 +301,9 @@ public class AttachSourcesNotificationProvider extends EditorNotifications.Provi
Library firstLibrary = libraries.get(0).getLibrary();
VirtualFile[] roots = firstLibrary != null ? firstLibrary.getFiles(OrderRootType.CLASSES) : VirtualFile.EMPTY_ARRAY;
VirtualFile[] candidates = FileChooser.chooseFiles(descriptor, myProject, roots.length == 0 ? null : PathUtil.getLocalFile(roots[0]));
final VirtualFile[] files = LibrarySourceRootDetectorUtil.scanAndSelectDetectedJavaSourceRoots(myParentComponent, candidates);
if (files.length == 0) {
return ActionCallback.REJECTED;
}
if (candidates.length == 0) return ActionCallback.REJECTED;
VirtualFile[] files = LibrarySourceRootDetectorUtil.scanAndSelectDetectedJavaSourceRoots(myParentComponent, candidates);
if (files.length == 0) return ActionCallback.REJECTED;
final Map<Library, LibraryOrderEntry> librariesToAppendSourcesTo = new HashMap<Library, LibraryOrderEntry>();
for (LibraryOrderEntry library : libraries) {