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

Renamed methods getUserData and putUserData to get and put, respectively.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-08 00:09:50 +04:00
parent 7c7a64bc6b
commit 8124e477ce
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+2 -2
View File
@@ -163,8 +163,8 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, K2JVMComp
@NotNull
private static CompilerConfiguration createCompilerConfiguration(@NotNull K2JVMCompilerArguments arguments) {
CompilerConfiguration configuration = new CompilerConfiguration();
configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, getClasspath(arguments).toArray(new File[0]));
configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(arguments).toArray(new File[0]));
configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, getClasspath(arguments).toArray(new File[0]));
configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, getAnnotationsPath(arguments).toArray(new File[0]));
return configuration;
}
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+2 -2
View File
@@ -142,11 +142,11 @@ public class CompileEnvironmentUtil {
}
};
CompilerConfiguration configuration = new CompilerConfiguration();
configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{
configuration.put(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{
PathUtil.findRtJar(),
PathUtil.getDefaultRuntimePath()
});
configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[]{
configuration.put(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[]{
PathUtil.getJdkAnnotationsPath()
});
JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+2 -2
View File
@@ -168,8 +168,8 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
}
public void configure(@NotNull CompilerConfiguration compilerConfiguration) {
File[] classpath = compilerConfiguration.getUserData(JVMConfigurationKeys.CLASSPATH_KEY);
File[] annotationsPath = compilerConfiguration.getUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY);
File[] classpath = compilerConfiguration.get(JVMConfigurationKeys.CLASSPATH_KEY);
File[] annotationsPath = compilerConfiguration.get(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY);
if (classpath != null) {
for (File path : classpath) {
addToClasspath(path);
compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+1 -1
View File
@@ -105,7 +105,7 @@ public class ReplInterpreter {
List<URL> classpath = Lists.newArrayList();
for (File file : configuration.getUserData(JVMConfigurationKeys.CLASSPATH_KEY)) {
for (File file : configuration.get(JVMConfigurationKeys.CLASSPATH_KEY)) {
try {
classpath.add(file.toURI().toURL());
}