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

IDEA-115260: correctly identify "java-compatible" sdk

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-10-22 22:14:17 +02:00
parent b3e99ae1a4
commit fcd8b45159
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/ProjectPaths.java
+7 -4
View File
@@ -25,6 +25,7 @@ import org.jetbrains.jps.model.java.*;
import org.jetbrains.jps.model.java.compiler.ProcessorConfigProfile;
import org.jetbrains.jps.model.library.JpsOrderRootType;
import org.jetbrains.jps.model.library.sdk.JpsSdk;
import org.jetbrains.jps.model.library.sdk.JpsSdkType;
import org.jetbrains.jps.model.module.JpsDependencyElement;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
@@ -213,10 +214,12 @@ public class ProjectPaths {
@Override
public boolean value(JpsDependencyElement dependency) {
if (myModule.equals(dependency.getContainingModule()) &&
dependency instanceof JpsSdkDependency && ((JpsSdkDependency)dependency).getSdkType().equals(JpsJavaSdkType.INSTANCE)) {
mySdkFound = true;
return false;
if (myModule.equals(dependency.getContainingModule()) && dependency instanceof JpsSdkDependency) {
final JpsSdkType<?> sdkType = ((JpsSdkDependency)dependency).getSdkType();
if (sdkType.equals(JpsJavaSdkType.INSTANCE) || sdkType instanceof JpsJavaSdkTypeWrapper) {
mySdkFound = true;
return false;
}
}
return mySdkFound;
}