X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=c151177e73e1915fae355b66fc9939ff33507b56;hp=c04a4357f6f898bb5a54882abf7a9366cbeee76c;hb=4e1b134e29313a1bdac18de57fe547299e5ded2a;hpb=907cc6c50755c0d19b93c15678d6f3022a6ee10b

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index c04a4357..c151177e 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
@@ -98,11 +98,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
 	AltosFlightStatusUpdate	status_update;
 
-	public void show(AltosState state, int crc_errors) {
+	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		JComponent tab = which_tab(state);
-		try {
-		pad.show(state, crc_errors);
+
+		if (state == null)
+			state = new AltosState();
+
+		pad.show(state, listener_state);
 
 		if (state.state != Altos.ao_flight_startup) {
 			if (!has_state) {
@@ -114,25 +116,26 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 			}
 		}
 
-		ascent.show(state, crc_errors);
-		descent.show(state, crc_errors);
-		landed.show(state, crc_errors);
+		ascent.show(state, listener_state);
+		descent.show(state, listener_state);
+		landed.show(state, listener_state);
 
+		JComponent tab = which_tab(state);
 		if (tab != cur_tab) {
 			if (cur_tab == pane.getSelectedComponent()) {
 				pane.setSelectedComponent(tab);
 			}
 			cur_tab = tab;
 		}
-		flightStatus.show(state, crc_errors);
-		flightInfo.show(state, crc_errors);
+		flightStatus.show(state, listener_state);
+		flightInfo.show(state, listener_state);
 
-		if (state.data.companion != null) {
+		if (state.companion != null) {
 			if (!has_companion) {
 				pane.add("Companion", companion);
 				has_companion= true;
 			}
-			companion.show(state, crc_errors);
+			companion.show(state, listener_state);
 		} else {
 			if (has_companion) {
 				pane.remove(companion);
@@ -144,17 +147,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 				pane.add("Site Map", sitemap);
 				has_map = true;
 			}
-			sitemap.show(state, crc_errors);
+			sitemap.show(state, listener_state);
 		} else {
 			if (has_map) {
 				pane.remove(sitemap);
 				has_map = false;
 			}
 		}
-		} catch (Exception e) {
-			System.out.print("Show exception " + e + "\n");
-			e.printStackTrace();
-		}
 	}
 
 	public void set_exit_on_close() {