X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlash.java;h=3af25c23457b696529ea8a2eb19fc1a8bb06278a;hp=a3e431cdf7dd9c60bde16953d40f116236420b0b;hb=d1005f68376d695039c314b8d7a68bbf9acbca4f;hpb=ddc83b4c401be965a9947782becf20cc8c54e6a2

diff --git a/ao-tools/altosui/AltosFlash.java b/ao-tools/altosui/AltosFlash.java
index a3e431cd..3af25c23 100644
--- a/ao-tools/altosui/AltosFlash.java
+++ b/ao-tools/altosui/AltosFlash.java
@@ -28,8 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.AltosHexfile;
-
 public class AltosFlash {
 	File		file;
 	FileInputStream	input;
@@ -331,17 +329,16 @@ 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())
+		if (!debug.check_connection()) {
+			debug.close();
 			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