diff --git a/pom.xml b/pom.xml index da02e5f..bb4e3e3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ istlab.KisoJikkenNWP KisoJikkenNWP jar - 0.6 + 0.61 KisoJikkenNWP http://maven.apache.org diff --git a/src/main/java/istlab/KisoJikken/JExecutor.java b/src/main/java/istlab/KisoJikken/JExecutor.java index e6fdd63..14921ec 100644 --- a/src/main/java/istlab/KisoJikken/JExecutor.java +++ b/src/main/java/istlab/KisoJikken/JExecutor.java @@ -41,15 +41,19 @@ ArrayList comlist = new ArrayList(); comlist.add("java"); comlist.add(pkgname + "." + javafname); - String[] split = commandLineOption.split(" "); - for(int i=0;i 0) { + String[] split = commandLineOption.split(" "); + for (int i = 0; i < split.length; i++) + comlist.add(split[i]); + } ProcessBuilder processBuilder = new ProcessBuilder(comlist); processBuilder.redirectErrorStream(true); - JTAConsole con = new JTAConsole("(Exec) java " + pkgname + "." + javafname+" "+commandLineOption); + JTAConsole con = new JTAConsole("(Exec) java " + pkgname + "." + javafname + " " + commandLineOption); con.Systemoutprintln("== 実行開始 =="); con.Systemoutprintln("> cd ~" + App.nwpsrc); - con.Systemoutprintln("> java " + pkgname + "." + javafname+" "+commandLineOption); + con.Systemoutprintln("> java " + pkgname + "." + javafname + " " + commandLineOption); // ProcessBuilder processBuilder = new ProcessBuilder("pwd"); processBuilder.directory(new File(App.userhome + App.nwpsrc)); // processBuilder.inheritIO(); diff --git a/src/main/java/istlab/KisoJikken/Launcher.java b/src/main/java/istlab/KisoJikken/Launcher.java index a3f7a75..deef233 100644 --- a/src/main/java/istlab/KisoJikken/Launcher.java +++ b/src/main/java/istlab/KisoJikken/Launcher.java @@ -41,7 +41,7 @@ public class Launcher extends JFrame implements MouseInputListener, KeyListener { public static Launcher theapp; - public static String version = "0.6"; + public static String version = "0.61"; public static String downloadurl = "https://cit.istlab.info/KisoJikkenNWP/target/"; public static Path execPath; // JPanel mainP; @@ -227,9 +227,9 @@ System.out.println("=" + execPath.getFileName() + "="); if (latestVersion.equals(execPath.getFileName().toString())) { - JOptionPane.showMessageDialog(this, "This is latest version : v" + version); + JOptionPane.showMessageDialog(this, "This is latest version : v" + version+"\n(download folder: "+execPath.getParent().toString()+")"); } else { - int res = JOptionPane.showConfirmDialog(this, "Really download new version \n(" + latestVersion + ") ??"); + int res = JOptionPane.showConfirmDialog(this, "Really download new version \n(" + latestVersion + ") ?\n(download folder: "+execPath.getParent().toString()+")"); if (res == JOptionPane.YES_OPTION) { try { URL url = new URL(downloadurl + "/" + latestVersion); @@ -248,7 +248,6 @@ openExecPath(); } } - } public void openExecPath() {