MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-64675 Add Framework - groovy - Can't add Framework - Ok Button isn't active

Browse Source
This commit is contained in:
peter
2011-02-03 11:49:50 +01:00
parent 99e423fc86
commit 02239b6487
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyConfigUtils.java
+8 -8
View File
@@ -70,16 +70,16 @@ public abstract class GroovyConfigUtils extends AbstractConfigUtils {
@NotNull
public String getSDKVersion(@NotNull final String path) {
String groovyJarVersion = getSDKJarVersion(path + "/lib", GROOVY_JAR_PATTERN, MANIFEST_PATH);
if (groovyJarVersion != null) {
return groovyJarVersion;
if (groovyJarVersion == null) {
groovyJarVersion = getSDKJarVersion(path + "/lib", GROOVY_JAR_PATTERN_NOVERSION, MANIFEST_PATH);
}
groovyJarVersion = getSDKJarVersion(path + "/lib", GROOVY_ALL_JAR_PATTERN, MANIFEST_PATH);
if (groovyJarVersion != null) {
return groovyJarVersion;
if (groovyJarVersion == null) {
groovyJarVersion = getSDKJarVersion(path + "/lib", GROOVY_ALL_JAR_PATTERN, MANIFEST_PATH);
}
return UNDEFINED_VERSION;
if (groovyJarVersion == null) {
groovyJarVersion = getSDKJarVersion(path + "/embeddable", GROOVY_ALL_JAR_PATTERN, MANIFEST_PATH);
}
return groovyJarVersion == null ? UNDEFINED_VERSION : groovyJarVersion;
}
public boolean isSDKLibrary(Library library) {
plugins/groovy/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class LibrariesUtil {
private static String getGroovySdkHome(VirtualFile[] classRoots) {
for (VirtualFile file : classRoots) {
final String name = file.getName();
if (name.matches(GroovyConfigUtils.GROOVY_JAR_PATTERN)) {
if (name.matches(GroovyConfigUtils.GROOVY_JAR_PATTERN_NOVERSION) || name.matches(GroovyConfigUtils.GROOVY_JAR_PATTERN)) {
String jarPath = file.getPresentableUrl();
File realFile = new File(jarPath);
if (realFile.exists()) {