diff --git a/src/main/java/istlab/KisoJikken/JCompiler.java b/src/main/java/istlab/KisoJikken/JCompiler.java index 3e8defe..4f555e5 100644 --- a/src/main/java/istlab/KisoJikken/JCompiler.java +++ b/src/main/java/istlab/KisoJikken/JCompiler.java @@ -37,9 +37,9 @@ // System.out.println("== コンパイル開始 =="); ProcessBuilder processBuilder = new ProcessBuilder("bash", "-c", "javac -encoding UTF-8 " + pkgname + "/*.java"); - if (App.isWindows) { - processBuilder = new ProcessBuilder("javac -encoding UTF-8 " + pkgname + "/*.java"); - } + // if (App.isWindows) { + // processBuilder = new ProcessBuilder("javac -encoding UTF-8 " + pkgname + "/*.java"); + // } processBuilder.redirectErrorStream(true); JTAConsole con = new JTAConsole("(Compile) javac " + pkgname + "/*.java"); con.setMainSrcByFileName(absolutePath); diff --git a/src/main/java/istlab/KisoJikken/Launcher.java b/src/main/java/istlab/KisoJikken/Launcher.java index 2649d3d..b7081b4 100644 --- a/src/main/java/istlab/KisoJikken/Launcher.java +++ b/src/main/java/istlab/KisoJikken/Launcher.java @@ -115,6 +115,19 @@ }); menu.add(mi); + mi = new JMenuItem("NWPフォルダを最新にする(git pull)"); + mi.addActionListener(ae -> { + try { + gitrepom.pull(); + } catch (NoWorkTreeException e) { + e.printStackTrace(); + } catch (GitAPIException e) { + e.printStackTrace(); + } + }); + menu.add(mi); + + menu.addSeparator(); mi = new JMenuItem("Launcherを再起動する");