From 68ef44960ee3ea78e6b3a876e3dd7c7c610062da Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 7 Jul 2010 21:56:49 +0400 Subject: [PATCH] editable paths list for Python interpreter (PY-1201) --- .../src/com/intellij/openapi/projectRoots/ui/SdkEditor.java | 2 +- .../com/intellij/openapi/projectRoots/ui/PathEditor.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java index f10493bb9d82..82b82d45f5de 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java @@ -215,7 +215,7 @@ public class SdkEditor implements Configurable, Place.Navigator { else{ final SdkModificator sdkModificator = mySdk.getSdkModificator(); for (OrderRootType type : myPathEditors.keySet()) { - myPathEditors.get(type).reset(sdkModificator.getRoots(type)); + myPathEditors.get(type).reset(sdkModificator); } sdkModificator.commitChanges(); setHomePathValue(mySdk.getHomePath().replace('/', File.separatorChar)); diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ui/PathEditor.java index 766bf3590f81..d57d4838b94c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -38,6 +38,7 @@ import com.intellij.util.Icons; import com.intellij.util.containers.HashSet; import com.intellij.util.ui.UIUtil; import gnu.trove.TIntArrayList; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -121,11 +122,12 @@ public class PathEditor { return roots; } - public void reset(VirtualFile[] files) { + public void reset(@Nullable SdkModificator modificator) { keepSelectionState(); clearList(); - myEnabled = files != null; + myEnabled = modificator != null; if(myEnabled){ + VirtualFile[] files = modificator.getRoots(myOrderRootType); for (VirtualFile file : files) { addElement(file); }