diff --git a/src/main/java/istlab/KisoJikken/JExecutor.java b/src/main/java/istlab/KisoJikken/JExecutor.java index 05c368d..45c0ad9 100644 --- a/src/main/java/istlab/KisoJikken/JExecutor.java +++ b/src/main/java/istlab/KisoJikken/JExecutor.java @@ -15,6 +15,7 @@ /** * 引数はコマンドライン + * * @param p * @param comlineOpt */ @@ -45,7 +46,7 @@ public void run() { ArrayList comlist = new ArrayList(); // comlist.add("java -D\"file.encoding=UTF-8\" "); - if (App.isWindows){ + if (App.isWindows) { comlist.add("wt"); } else { @@ -61,25 +62,28 @@ ProcessBuilder processBuilder = new ProcessBuilder(comlist); processBuilder.redirectErrorStream(true); - JTAConsole con = new JTAConsole("(Exec) java " + pkgname + "." + javafname + " " + commandLineOption); - con.setMainSrcByFileName(absolutePath); - con.Systemoutprintln("=== 実行開始 ==="); - con.Systemoutprintln(CommandRunner.prompt+"cd ~" + App.nwpsrc); - con.Systemoutprintln(CommandRunner.prompt+"java " + pkgname + "." + javafname + " " + commandLineOption); + JTAConsole con = null; + if (!App.isWindows) { + con = new JTAConsole("(Exec) java " + pkgname + "." + javafname + " " + commandLineOption); + con.setMainSrcByFileName(absolutePath); + con.Systemoutprintln("=== 実行開始 ==="); + con.Systemoutprintln(CommandRunner.prompt + "cd ~" + App.nwpsrc); + con.Systemoutprintln(CommandRunner.prompt + "java " + pkgname + "." + javafname + " " + commandLineOption); + } // ProcessBuilder processBuilder = new ProcessBuilder("pwd"); processBuilder.directory(new File(App.userhome + App.nwpsrc)); // processBuilder.inheritIO(); try { process = processBuilder.start(); - Launcher.allProcs.add(process); - if (!App.isWindows) con.startBR(process); + if (!App.isWindows) { + Launcher.allProcs.add(process); + con.startBR(process); + } // process.waitFor(); - } catch (IOException e1) { e1.printStackTrace(); } - - con.Systemoutprintln("=== 実行終了 === (ALT+Wで閉じる)"); + if (con != null) con.Systemoutprintln("=== 実行終了 === (ALT+Wで閉じる)"); thread = null; } }