From d484ae9779133c884f49d9e46c3ca8f8ca0fe01b Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 7 Oct 2011 13:51:19 +0400 Subject: [PATCH] avoided storing detected library properties in the model --- .../libraryEditor/ExistingLibraryEditor.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ExistingLibraryEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ExistingLibraryEditor.java index 5f4994d2ed01..2e06d3fb8f0a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ExistingLibraryEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ExistingLibraryEditor.java @@ -36,6 +36,7 @@ public class ExistingLibraryEditor extends LibraryEditorBase implements Disposab private final LibraryEditorListener myListener; private String myLibraryName = null; private LibraryProperties myLibraryProperties; + private LibraryProperties myDetectedLibraryProperties; private Library.ModifiableModel myModel = null; private LibraryType myDetectedType; private boolean myDetectedTypeComputed; @@ -76,7 +77,7 @@ public class ExistingLibraryEditor extends LibraryEditorBase implements Disposab final Pair,LibraryProperties> pair = LibraryDetectionManager.getInstance().detectType(Arrays.asList(getFiles(OrderRootType.CLASSES))); if (pair != null) { myDetectedType = pair.getFirst(); - myLibraryProperties = pair.getSecond(); + myDetectedLibraryProperties = pair.getSecond(); } myDetectedTypeComputed = true; } @@ -88,6 +89,10 @@ public class ExistingLibraryEditor extends LibraryEditorBase implements Disposab final LibraryType type = getType(); if (type == null) return null; + if (myDetectedType != null) { + return myDetectedLibraryProperties; + } + if (myLibraryProperties == null) { myLibraryProperties = type.createDefaultProperties(); //noinspection unchecked @@ -155,7 +160,7 @@ public class ExistingLibraryEditor extends LibraryEditorBase implements Disposab @Override public void addJarDirectory(String url, boolean recursive, OrderRootType rootType) { - getModel() .addJarDirectory(url, recursive, rootType); + getModel().addJarDirectory(url, recursive, rootType); } @Override