From 61558d19677e2e9598f3dd35f7970e1c12ffa80d Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Mon, 21 Dec 2009 13:42:59 +0000
Subject: [PATCH] accept Grails sdk paths entered manually (IDEADEV-40075)

---
 .../groovy/config/ui/GroovyFacetEditor.java   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/GroovyFacetEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/GroovyFacetEditor.java
index 644d4dfb25b1..4033da5fcca7 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/GroovyFacetEditor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/GroovyFacetEditor.java
@@ -27,8 +27,8 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.DocumentAdapter;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,7 +37,6 @@ import org.jetbrains.plugins.groovy.config.LibraryManager;
 import org.jetbrains.plugins.groovy.util.GroovyUtils;
 
 import javax.swing.*;
-import javax.swing.event.DocumentEvent;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -66,7 +65,6 @@ public class GroovyFacetEditor {
   private JComboBox myComboBox;
   private JRadioButton myExistingSdk;
   private JRadioButton myNewSdk;
-  private AbstractGroovyLibraryManager myChosenManager;
   private final Class<? extends LibraryManager> myAcceptableManager;
 
   public GroovyFacetEditor(@Nullable Project project) {
@@ -165,7 +163,15 @@ public class GroovyFacetEditor {
   @Nullable
   public AbstractGroovyLibraryManager getChosenManager() {
     if (addNewSdk()) {
-      return myChosenManager;
+      final String path = getNewSdkPath();
+      if (path != null) {
+        final VirtualFile file = LocalFileSystem.getInstance().refreshAndFindFileByPath(FileUtil.toSystemIndependentName(path));
+        if (file != null && file.isDirectory()) {
+          return findManager(file);
+        }
+      }
+
+      return null;
     }
     final Object selectedItem = myComboBox.getSelectedItem();
     if (selectedItem != null && selectedItem instanceof Pair) {
@@ -179,13 +185,6 @@ public class GroovyFacetEditor {
   }
 
   private void configureSdkPathField(@Nullable final Project project) {
-    mySdkPath.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
-      @Override
-      protected void textChanged(DocumentEvent e) {
-        myChosenManager = null;
-      }
-    });
-
     mySdkPath.getButton().addActionListener(new ActionListener() {
 
       public void actionPerformed(final ActionEvent e) {
@@ -203,7 +202,6 @@ public class GroovyFacetEditor {
         if (files.length > 0) {
           final VirtualFile dir = files[0];
           mySdkPath.setText(FileUtil.toSystemDependentName(dir.getPath()));
-          myChosenManager = findManager(dir);
         }
       }
     });