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

Usinf io.File instead of concatenating paths

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-12 11:55:19 +04:00
parent 9619de2060
commit 8fc46680d6
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
+5 -7
View File
@@ -129,7 +129,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
private static Integer doExec(@NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, @NotNull PrintStream out, private static Integer doExec(@NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, @NotNull PrintStream out,
@NotNull Module module) throws Exception { @NotNull Module module) throws Exception {
File outDir = environment.getOutput(); File outDir = environment.getOutput();
String outFile = outDir.getPath() + "/" + module.getName() + ".js"; File outFile = new File(outDir, module.getName() + ".js");
String[] commandLineArgs = constructArguments(module, outFile); String[] commandLineArgs = constructArguments(module, outFile);
Object rc = invokeExecMethod(environment, out, messageCollector, commandLineArgs, "org.jetbrains.jet.cli.js.K2JSCompiler"); Object rc = invokeExecMethod(environment, out, messageCollector, commandLineArgs, "org.jetbrains.jet.cli.js.K2JSCompiler");
@@ -142,7 +142,7 @@ public final class K2JSCompiler implements TranslatingCompiler {
} }
@NotNull @NotNull
private static String[] constructArguments(@NotNull Module module, @Nullable String outFile) { private static String[] constructArguments(@NotNull Module module, @NotNull File outFile) {
VirtualFile[] sourceFiles = getSourceFiles(module); VirtualFile[] sourceFiles = getSourceFiles(module);
ArrayList<String> args = Lists.newArrayList("-tags", "-verbose", "-version"); ArrayList<String> args = Lists.newArrayList("-tags", "-verbose", "-version");
@@ -234,11 +234,9 @@ public final class K2JSCompiler implements TranslatingCompiler {
} }
} }
private static void addOutputPath(@Nullable String outFile, @NotNull ArrayList<String> args) { private static void addOutputPath(@NotNull File outFile, @NotNull ArrayList<String> args) {
if (outFile != null) { args.add("-output");
args.add("-output"); args.add(outFile.getPath());
args.add(outFile);
}
} }
@NotNull @NotNull