X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=b5652df3cffb13d8909f3aa3141727a63f28d931;hp=462bff181a3613fa4783162d9742b2f51cde842c;hb=71715337eb532a1fbe1a753240e7417d5223489f;hpb=cc0ea39fee73417ecd69c020d9eca723ebb2cf65

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 462bff18..b5652df3 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -23,8 +23,9 @@ import javax.swing.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
-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 {
 	AltosDevice		device;
@@ -37,11 +38,11 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 	boolean			remote;
 
 	void stop_display() {
-		if (thread != null && thread.isAlive()) {
-			thread.interrupt();
+		if (thread != null) {
 			try {
-				thread.join();
-			} catch (InterruptedException ie) {}
+				thread.abort();
+			} catch (InterruptedException ie) {
+			}
 		}
 		thread = null;
 	}
@@ -66,21 +67,21 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 	AltosFlightStatusUpdate	status_update;
 
-	public void show(AltosState state, int crc_errors) {
+	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		try {
-			pad.show(state, crc_errors);
-			flightStatus.show(state, crc_errors);
-			flightInfo.show(state, crc_errors);
-		} catch (Exception e) {
-			System.out.print("Show exception" + e);
-		}
+//		try {
+			pad.show(state, listener_state);
+			flightStatus.show(state, listener_state);
+			flightInfo.show(state, listener_state);
+//		} catch (Exception e) {
+//			System.out.print("Show exception " + e);
+//		}
 	}
 
-	public void update(final AltosState state) {
+	public void update(final AltosState state, final AltosListenerState listener_state) {
 		Runnable r = new Runnable() {
 				public void run() {
-					show(state, 0);
+					show(state, listener_state);
 				}
 			};
 		SwingUtilities.invokeLater(r);
@@ -92,8 +93,11 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
-		if (callsign_value != null)
-			AltosUIPreferences.set_callsign(callsign_value.getText());
+		if (callsign_value != null) {
+			String	callsign = callsign_value.getText();
+			thread.set_callsign(callsign);
+			AltosUIPreferences.set_callsign(callsign);
+		}
 	}
 
 	public void insertUpdate(DocumentEvent e) {
@@ -128,8 +132,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 +168,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 +231,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 e : ex.getStackTrace())
+							System.out.printf("%s\n", e.toString());
+					}
 					setVisible(false);
 					dispose();
 					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
@@ -201,7 +247,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);