From bc1ae2e2dc0761708ba68059af2541f292e05f98 Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Sun, 22 Nov 2009 19:02:23 +0000
Subject: [PATCH] support separate-jar grails in classpath (e.g. imported from
 eclipse)

---
 .../groovy/config/AbstractConfigUtils.java      | 15 ---------------
 .../groovy/config/GroovyConfigUtils.java        | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/AbstractConfigUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/AbstractConfigUtils.java
index 912710698217..e4255329a795 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/AbstractConfigUtils.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/AbstractConfigUtils.java
@@ -139,11 +139,6 @@ public abstract class AbstractConfigUtils {
 
   public abstract boolean isSDKLibrary(Library library);
 
-  @NotNull
-  public String getSDKLibVersion(Library library) {
-    return getSDKVersion(LibrariesUtil.getGroovyLibraryHome(library));
-  }
-
   public Library[] getSDKLibrariesByModule(final Module module) {
     final Condition<Library> condition = new Condition<Library>() {
       public boolean value(Library library) {
@@ -153,15 +148,5 @@ public abstract class AbstractConfigUtils {
     return LibrariesUtil.getLibrariesByCondition(module, condition);
   }
 
-  public Collection<String> getSDKVersions(final Project project) {
-    return ContainerUtil.map2List(getAllSDKLibraries(project), new Function<Library, String>() {
-      public String fun(Library library) {
-        return getSDKLibVersion(library);
-      }
-    });
-  }
-
-  @NotNull
-  public abstract String getSDKInstallPath(Module module);
 
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java
index 351fa8d26a22..bdc7cf9a3fe3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java
@@ -29,6 +29,8 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,6 +39,8 @@ import org.jetbrains.plugins.groovy.GroovyIcons;
 import org.jetbrains.plugins.groovy.util.GroovyUtils;
 import org.jetbrains.plugins.groovy.util.LibrariesUtil;
 
+import java.util.Collection;
+
 /**
  * @author ilyas
  */
@@ -174,4 +178,17 @@ public abstract class GroovyConfigUtils extends AbstractConfigUtils {
     }
     return false;
   }
+
+  @NotNull
+  public String getSDKLibVersion(Library library) {
+    return getSDKVersion(LibrariesUtil.getGroovyLibraryHome(library));
+  }
+
+  public Collection<String> getSDKVersions(final Project project) {
+    return ContainerUtil.map2List(getAllSDKLibraries(project), new Function<Library, String>() {
+      public String fun(Library library) {
+        return getSDKLibVersion(library);
+      }
+    });
+  }
 }