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

IDEA-74995: Trying to add a library results in NPE and freezes IDEA

Browse Source
This commit is contained in:
nik
2011-10-03 10:48:35 +04:00
parent 1df45dbaf8
commit 6fb1cfae79
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectView/actions/CreateLibraryFromFilesDialog.java
+11 -7
View File
@@ -54,7 +54,7 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
private JPanel myPanel;
private final LibrariesContainer myLibrariesContainer;
private final String myDefaultName;
private final ModifiableRootModel myModifiableModel;
@Nullable private final ModifiableRootModel myModifiableModel;
public CreateLibraryFromFilesDialog(@NotNull Project project, @NotNull List<OrderRoot> roots) {
super(project, true);
@@ -143,11 +143,13 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
try {
final Library library = myLibrariesContainer.createLibrary(myNameAndLevelPanel.getLibraryName(),
level, myRoots);
if (level == LibrariesContainer.LibraryLevel.MODULE) {
myModifiableModel.commit();
}
else {
myModifiableModel.dispose();
if (myModifiableModel != null) {
if (level == LibrariesContainer.LibraryLevel.MODULE) {
myModifiableModel.commit();
}
else {
myModifiableModel.dispose();
}
}
final Module module = myModulesCombobox.getSelectedModule();
if (module != null && level != LibrariesContainer.LibraryLevel.MODULE) {
@@ -164,7 +166,9 @@ public class CreateLibraryFromFilesDialog extends DialogWrapper {
@Override
public void doCancelAction() {
myModifiableModel.dispose();
if (myModifiableModel != null) {
myModifiableModel.dispose();
}
super.doCancelAction();
}