From cd2723075a73a797f7b91ce66a418dfa8e0d033c Mon Sep 17 00:00:00 2001
From: Ekaterina Tuzova <Ekaterina.Tuzova@jetbrains.com>
Date: Sat, 12 May 2012 18:16:36 +0400
Subject: [PATCH] fixed PY-6117 Show flavor icons in "Add" popup when adding a
 new Python interpreter

---
 .../jetbrains/python/sdk/PySdkListCellRenderer.java  |  2 +-
 .../com/jetbrains/python/sdk/PythonSdkFlavor.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/sdk/PySdkListCellRenderer.java b/python/src/com/jetbrains/python/sdk/PySdkListCellRenderer.java
index 144015f3f121..88155dea63dd 100644
--- a/python/src/com/jetbrains/python/sdk/PySdkListCellRenderer.java
+++ b/python/src/com/jetbrains/python/sdk/PySdkListCellRenderer.java
@@ -20,7 +20,7 @@ public class PySdkListCellRenderer extends HtmlListCellRenderer<Sdk> {
   @Override
   protected void doCustomize(final JList list, final Sdk sdk, final int index, final boolean selected, final boolean hasFocus) {
     if (sdk != null) {
-      final PythonSdkFlavor flavor = PythonSdkFlavor.getFlavor(sdk);
+      final PythonSdkFlavor flavor = PythonSdkFlavor.getPlatformIndependentFlavor(sdk.getHomePath());
       final Icon icon = flavor != null ? flavor.getIcon() : sdk.getSdkType().getIcon();
       final String name;
       if (mySdkModificators != null && mySdkModificators.containsKey(sdk)) {
diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkFlavor.java b/python/src/com/jetbrains/python/sdk/PythonSdkFlavor.java
index 13d89bba101d..f80c9e12c803 100644
--- a/python/src/com/jetbrains/python/sdk/PythonSdkFlavor.java
+++ b/python/src/com/jetbrains/python/sdk/PythonSdkFlavor.java
@@ -101,6 +101,18 @@ public abstract class PythonSdkFlavor {
     return null;
   }
 
+  @Nullable
+  public static PythonSdkFlavor getPlatformIndependentFlavor(@Nullable final String sdkPath) {
+    if (sdkPath == null) return null;
+
+    for (PythonSdkFlavor flavor : getPlatformIndependentFlavors()) {
+      if (flavor.isValidSdkHome(sdkPath)) {
+        return flavor;
+      }
+    }
+    return null;
+  }
+
   /**
    * Checks if the path is the name of a Python interpreter of this flavor.
    *