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

nondisposed libraries fix

Browse Source
This commit is contained in:
Gregory Shrago
2009-10-30 17:41:50 +03:00
parent f32d00b44d
commit 066324e6ef
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java
+4 -2
View File
@@ -163,12 +163,14 @@ public class SimpleClasspathPanel extends JPanel {
list.scrollRectToVisible(cellRect);
}
private static Collection<Library> ensureApplicationLevel(final Library library, final Set<VirtualFile> existingFiles) {
private static Collection<Library> ensureApplicationLevel(final Library library, final Set<VirtualFile> existingFiles,
final Disposable parentDisposable) {
if (library.getTable() == null || !LibraryTablesRegistrar.APPLICATION_LEVEL.equals(library.getTable().getTableLevel())) {
final ArrayList<Library> result = new ArrayList<Library>();
for (VirtualFile file : library.getFiles(OrderRootType.CLASSES)) {
if (!existingFiles.add(file)) continue;
final Library newLibrary = LibraryTableImplUtil.createModuleLevelLibrary(null, null);
Disposer.register(parentDisposable, newLibrary);
final Library.ModifiableModel libModel = newLibrary.getModifiableModel();
libModel.addRoot(file, OrderRootType.CLASSES);
libModel.commit();
@@ -264,7 +266,7 @@ public class SimpleClasspathPanel extends JPanel {
final List<Library> libraries = dialog.getSelectedLibraries();
final ArrayList<Library> result = new ArrayList<Library>();
for (Library o : libraries) {
result.addAll(ensureApplicationLevel(o, existingFiles));
result.addAll(ensureApplicationLevel(o, existingFiles, myDisposable));
}
return result;
}