diff --git a/pom.xml b/pom.xml index 46a6f4f..f27b416 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ info.istlab.IoTP IoTP jar - 0.15 + 0.16 IoTP http://maven.apache.org diff --git a/src/main/java/info/istlab/IoTP/CommandRunner.java b/src/main/java/info/istlab/IoTP/CommandRunner.java index 7fcf754..e2f9f21 100644 --- a/src/main/java/info/istlab/IoTP/CommandRunner.java +++ b/src/main/java/info/istlab/IoTP/CommandRunner.java @@ -63,7 +63,7 @@ try { process = processBuilder.start(); - Launcher.allProcs.add(process); + // Launcher.allProcs.add(process); con.startBR(process); // BufferedReader reader = new BufferedReader(new diff --git a/src/main/java/info/istlab/IoTP/Editor.java b/src/main/java/info/istlab/IoTP/Editor.java index 714c849..16a612d 100644 --- a/src/main/java/info/istlab/IoTP/Editor.java +++ b/src/main/java/info/istlab/IoTP/Editor.java @@ -93,6 +93,7 @@ saveB = new JButton("Save"); saveB.addActionListener(this); saveB.setEnabled(false); + saveB.setToolTipText("保存"); // ファイルの拡張子によって、きりかえる if (file.getName().endsWith(".ino")) { @@ -111,6 +112,7 @@ JButton loadB = new JButton("Reload"); loadB.addActionListener(this); topP.add(loadB); + loadB.setToolTipText("再読み込み"); // 実行ボタン if (textArea.getSyntaxEditingStyle() == SyntaxConstants.SYNTAX_STYLE_UNIX_SHELL) { @@ -121,6 +123,7 @@ } else if (textArea.getSyntaxEditingStyle() == SyntaxConstants.SYNTAX_STYLE_C) { // compileB = new JButton("Compile"); execB = new JButton("Upload"); + execB.setToolTipText("コンパイルと書き込み"); // compileB.addActionListener(this); execB.addActionListener(this); // topP.add(compileB); diff --git a/src/main/java/info/istlab/IoTP/Launcher.java b/src/main/java/info/istlab/IoTP/Launcher.java index 4a8fd7c..0ff2047 100644 --- a/src/main/java/info/istlab/IoTP/Launcher.java +++ b/src/main/java/info/istlab/IoTP/Launcher.java @@ -26,7 +26,7 @@ public class Launcher extends JFrame implements MouseInputListener, KeyListener { public static Launcher theapp; - public static String version = "0.15"; + public static String version = "0.16"; // JPanel mainP; File root; JTree tree; @@ -194,8 +194,7 @@ } public void openExecPath() { - File execFolder = new File(App.workingDir); - openFolder(execFolder); + openFolder(App.execPath.toFile()); } public void openFolder(File path) { diff --git a/src/main/java/info/istlab/IoTP/ScriptRunner.java b/src/main/java/info/istlab/IoTP/ScriptRunner.java index 7016705..94905ef 100644 --- a/src/main/java/info/istlab/IoTP/ScriptRunner.java +++ b/src/main/java/info/istlab/IoTP/ScriptRunner.java @@ -57,6 +57,12 @@ if (srcfile.length() > 0) comlist.add(srcfile); } + if (App.serialName != null){ + SerialWindow swin = SerialWindow.hash.get(App.serialName); + if (swin != null){ + swin.closeSerialPort(); + } + } ProcessBuilder processBuilder = new ProcessBuilder(comlist); // ProcessBuilder processBuilder = new ProcessBuilder("pwd"); @@ -99,6 +105,7 @@ // runB.setText("Run"); SerialWindow.invoke(false); // no serial connectionsのとき、メッセージ表示しない if (App.isWindows) { + con.windowClosing(null); con.frame.dispose(); } }