X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=fc76b2b658c87db172a8043bce7e6912679ae7fa;hp=d54b05c54f35719743166cfe268f53e95466688a;hb=e9a3268285e97b7316c3321892e77814703ff71d;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index d54b05c5..fc76b2b6 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,8 +25,8 @@ import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.Arrays;
-import org.altusmetrum.altoslib_8.*;
-import org.altusmetrum.altosuilib_8.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
@@ -33,12 +34,12 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 	AltosPad		pad;
 	AltosInfoTable		flightInfo;
 	AltosFlightStatus	flightStatus;
-	AltosIgnitor		ignitor;
+	AltosIgnitor		igniter;
 	AltosIdleMonitor	thread;
-	AltosUIMapNew      	sitemap;
+	AltosUIMap      	sitemap;
 	int			serial;
 	boolean			remote;
-	boolean			has_ignitor;
+	boolean			has_igniter;
 	boolean			has_map;
 
 	void stop_display() {
@@ -74,15 +75,15 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		if (ignitor.should_show(state)) {
-			if (!has_ignitor) {
-				pane.add("Ignitor", ignitor);
-				has_ignitor = true;
+		if (igniter.should_show(state)) {
+			if (!has_igniter) {
+				pane.add("Ignitor", igniter);
+				has_igniter = true;
 			}
 		} else {
-			if (has_ignitor) {
-				pane.remove(ignitor);
-				has_ignitor = false;
+			if (has_igniter) {
+				pane.remove(igniter);
+				has_igniter = false;
 			}
 		}
 		if (state.gps != null && state.gps.connected) {
@@ -101,8 +102,8 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 			pad.show(state, listener_state);
 			flightStatus.show(state, listener_state);
 			flightInfo.show(state, listener_state);
-			if (has_ignitor)
-				ignitor.show(state, listener_state);
+			if (has_igniter)
+				igniter.show(state, listener_state);
 			if (has_map)
 				sitemap.show(state, listener_state);
 //		} catch (Exception e) {
@@ -128,6 +129,19 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		SwingUtilities.invokeLater(r);
 	}
 
+	public void error(final String reason) {
+		Runnable r = new Runnable() {
+				public void run() {
+					disconnect();
+					JOptionPane.showMessageDialog(AltosIdleMonitorUI.this,
+								      reason,
+								      "Error fetching data",
+								      JOptionPane.ERROR_MESSAGE);
+				}
+			};
+		SwingUtilities.invokeLater(r);
+	}
+
 	Container	bag;
 	AltosUIFreqList	frequencies;
 	JTextField	callsign_value;
@@ -260,9 +274,9 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo = new AltosInfoTable();
 		pane.add("Table", new JScrollPane(flightInfo));
 
-		ignitor = new AltosIgnitor();
+		igniter = new AltosIgnitor();
 
-		sitemap = new AltosUIMapNew();
+		sitemap = new AltosUIMap();
 
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));
@@ -281,7 +295,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		pack();
 		setVisible(true);
 
-		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
+		thread = new AltosIdleMonitor(this, link, (boolean) remote);
 
 		status_update = new AltosFlightStatusUpdate(flightStatus);