X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosEepromDownload.java;h=8996b9243a5284cc8a5b2606a6d15abc648e653b;hp=8efc94d284db7618db4c538a1c4db37fbbf29a11;hb=939be6793238a275b7682ecc376fed14379cf044;hpb=a0a92c605e238277c9881545a7226e53b5dbc295

diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 8efc94d2..8996b924 100644
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -28,18 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
 import libaltosJNI.*;
 
 public class AltosEepromDownload implements Runnable {
@@ -256,12 +244,11 @@ public class AltosEepromDownload implements Runnable {
 		frame = given_frame;
 		device = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
-		serial_line = new AltosSerial();
 		remote = false;
 
 		if (device != null) {
 			try {
-				serial_line.open(device);
+				serial_line = new AltosSerial(device);
 				if (!device.matchProduct(AltosDevice.product_telemetrum))
 					remote = true;
 				eeprom_thread = new Thread(this);
@@ -272,6 +259,12 @@ public class AltosEepromDownload implements Runnable {
 									    device.getPath()),
 							      "Cannot open target device",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (AltosSerialInUseException si) {
+				JOptionPane.showMessageDialog(frame,
+							      String.format("Device \"%s\" already in use",
+									    device.getPath()),
+							      "Device in use",
+							      JOptionPane.ERROR_MESSAGE);
 			} catch (IOException ee) {
 				JOptionPane.showMessageDialog(frame,
 							      device.getPath(),