altosui: Open serial device at 'new' time. Prohibit duplicate opens.

[fw/altos] / ao-tools / altosui / AltosFlash.java

diff --git a/ao-tools/altosui/AltosFlash.java b/ao-tools/altosui/AltosFlash.java
index 25b4a06efedadfb5c4a3bcb7926d28b8a606e243..fa2465d337748a0af7ee0fd79dcdd0c80d5e8552 100644 (file)
--- a/ao-tools/altosui/AltosFlash.java
+++ b/ao-tools/altosui/AltosFlash.java
@@ -329,17 +329,14 @@ public class AltosFlash {
                return rom_config;
        }
 
-       public void open() throws IOException, FileNotFoundException, InterruptedException {
+       public AltosFlash(File in_file, AltosDevice in_debug_dongle)
+               throws IOException, FileNotFoundException, AltosSerialInUseException, InterruptedException {
+               file = in_file;
+               debug_dongle = in_debug_dongle;
+               debug = new AltosDebug(in_debug_dongle);
                input = new FileInputStream(file);
                image = new AltosHexfile(input);
-               debug.open(debug_dongle);
                if (!debug.check_connection())
                        throw new IOException("Debug port not connected");
        }
-
-       public AltosFlash(File in_file, AltosDevice in_debug_dongle) {
-               file = in_file;
-               debug_dongle = in_debug_dongle;
-               debug = new AltosDebug();
-       }
 }
\ No newline at end of file