deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

kill potentially unfinished compilation process when dialog is closed

Browse source
This commit is contained in:
fros4943 2008-10-02 21:23:03 +00:00
parent fed6e1ccd5
commit 9cf79a6b21
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MspMoteType.java,v 1.11 2008/09/20 09:16:28 fros4943 Exp $ * $Id: MspMoteType.java,v 1.12 2008/10/02 21:23:03 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -351,6 +351,8 @@ public abstract class MspMoteType implements MoteType {
private String customizedCompileCommand = null; private String customizedCompileCommand = null;
private Process compileProcess;
static enum DialogState { static enum DialogState {
NO_SOURCE, SELECTED_SOURCE, IS_COMPILING, COMPILED_SOURCE NO_SOURCE, SELECTED_SOURCE, IS_COMPILING, COMPILED_SOURCE
} }
@ -458,7 +460,7 @@ public abstract class MspMoteType implements MoteType {
try { try {
String[] cmd = command.split(" "); String[] cmd = command.split(" ");
final Process compileProcess = Runtime.getRuntime().exec(cmd, null, compileProcess = Runtime.getRuntime().exec(cmd, null,
parentDirectory); parentDirectory);
final BufferedReader processNormal = new BufferedReader( final BufferedReader processNormal = new BufferedReader(
@ -606,6 +608,9 @@ public abstract class MspMoteType implements MoteType {
sourceFile = null; sourceFile = null;
ELFFile = null; ELFFile = null;
if (compileProcess != null) {
compileProcess.destroy();
}
myDialog.dispose(); myDialog.dispose();
} }
}); });