azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed jdkHeaders to altHeaders in all places where it makes sense.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-05-15 13:24:18 +04:00
parent 4ab2588cbd
commit 15f6e7403e
35 changed files with 172 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerDependencies.java
+5 -4
View File
@@ -54,7 +54,7 @@ public class CompilerDependencies {
throw new IllegalArgumentException("jdk must be included for mode " + compilerSpecialMode);
}
}
if (compilerSpecialMode.includeJdkHeaders()) {
if (compilerSpecialMode.includeAltHeaders()) {
if (altHeadersClasspath.length == 0) {
throw new IllegalArgumentException("altHeaders must be included for mode " + compilerSpecialMode);
}
@@ -88,13 +88,14 @@ public class CompilerDependencies {
@NotNull
public List<VirtualFile> getAltHeaderRoots() {
if (compilerSpecialMode.includeJdkHeaders()) {
if (compilerSpecialMode.includeAltHeaders()) {
return ContainerUtil.map2List(altHeadersClasspath, new Function<File, VirtualFile>() {
@Override
public VirtualFile fun(File file) {
if (file.exists()) {
if (file.isDirectory()) {
return VirtualFileManager.getInstance().findFileByUrl("file://" + FileUtil.toSystemIndependentName(file.getAbsolutePath()));
return VirtualFileManager.getInstance()
.findFileByUrl("file://" + FileUtil.toSystemIndependentName(file.getAbsolutePath()));
}
else {
return PathUtil.jarFileToVirtualFile(file);
@@ -126,7 +127,7 @@ public class CompilerDependencies {
return new CompilerDependencies(
compilerSpecialMode,
compilerSpecialMode.includeJdk() ? findRtJar() : null,
compilerSpecialMode.includeJdkHeaders() ? new File[]{PathUtil.getAltHeadersPath()} : new File[0],
compilerSpecialMode.includeAltHeaders() ? new File[]{PathUtil.getAltHeadersPath()} : new File[0],
compilerSpecialMode.includeKotlinRuntime() ? PathUtil.getDefaultRuntimePath() : null);
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/CompilerSpecialMode.java
+3 -3
View File
@@ -22,13 +22,13 @@ package org.jetbrains.jet.lang.resolve.java;
public enum CompilerSpecialMode {
REGULAR,
BUILTINS,
JDK_HEADERS,
ALT_HEADERS,
STDLIB,
IDEA,
JS,
;
public boolean includeJdkHeaders() {
public boolean includeAltHeaders() {
return this == REGULAR || this == STDLIB || this == IDEA;
}
@@ -41,6 +41,6 @@ public enum CompilerSpecialMode {
}
public boolean isStubs() {
return this == BUILTINS || this == JDK_HEADERS;
return this == BUILTINS || this == ALT_HEADERS;
}
}