X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=042111ec44347c5eb7803aa5fd477ffc6db41c4a;hp=f4e16243cd4b05e1cbe66c8623a8dd7f1e5d05b2;hb=bf684a4c290573a3aa627fd8ddf6f6ebbe5fa057;hpb=488a527267decece48e6682e0e0c7fc29cbed329

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index f4e16243..042111ec 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -23,10 +23,11 @@ import javax.swing.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_2.*;
-import org.altusmetrum.altosuilib_1.*;
+import java.util.Arrays;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
@@ -38,7 +39,10 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 	void stop_display() {
 		if (thread != null) {
-			thread.abort();
+			try {
+				thread.abort();
+			} catch (InterruptedException ie) {
+			}
 		}
 		thread = null;
 	}
@@ -52,13 +56,14 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo.clear();
 	}
 
-	public void set_font() {
-		pad.set_font();
-		flightInfo.set_font();
+	public void font_size_changed(int font_size) {
+		pad.font_size_changed(font_size);
+		flightInfo.font_size_changed(font_size);
 	}
 
-	public void font_size_changed(int font_size) {
-		set_font();
+	public void units_changed(boolean imperial_units) {
+		pad.units_changed(imperial_units);
+		flightInfo.units_changed(imperial_units);
 	}
 
 	AltosFlightStatusUpdate	status_update;
@@ -128,8 +133,35 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		return constraints(x, width, GridBagConstraints.NONE);
 	}
 
+	void idle_exception(JFrame owner, Exception e) {
+		if (e instanceof FileNotFoundException) {
+			JOptionPane.showMessageDialog(owner,
+						      ((FileNotFoundException) e).getMessage(),
+						      "Cannot open target device",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof AltosSerialInUseException) {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Device \"%s\" already in use",
+								    device.toShortString()),
+						      "Device in use",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof IOException) {
+			IOException ee = (IOException) e;
+			JOptionPane.showMessageDialog(owner,
+						      device.toShortString(),
+						      ee.getLocalizedMessage(),
+						      JOptionPane.ERROR_MESSAGE);
+		} else {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Connection to \"%s\" failed",
+								    device.toShortString()),
+						      "Connection Failed",
+						      JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
 	public AltosIdleMonitorUI(JFrame in_owner)
-		throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
+		throws FileNotFoundException, TimeoutException, InterruptedException {
 
 		device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
 		remote = false;
@@ -137,6 +169,15 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 			remote = true;
 
 		serial = device.getSerial();
+
+		AltosLink link;
+		try {
+			link = new AltosSerial(device);
+		} catch (Exception ex) {
+			idle_exception(in_owner, ex);
+			return;
+		}
+
 		bag = getContentPane();
 		bag.setLayout(new GridBagLayout());
 
@@ -191,7 +232,13 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					disconnect();
+					try {
+						disconnect();
+					} catch (Exception ex) {
+						System.out.printf("Exception %s\n", ex.toString());
+						for (StackTraceElement el : ex.getStackTrace())
+							System.out.printf("%s\n", el.toString());
+					}
 					setVisible(false);
 					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
@@ -201,7 +248,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		pack();
 		setVisible(true);
 
-		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, (AltosLink) new AltosSerial (device), (boolean) remote);
+		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
 
 		status_update = new AltosFlightStatusUpdate(flightStatus);