X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=9d575e4c8897ebb8c14e651ca94e5c64712348d7;hp=b97c8dc61e004024c9e38868805529a0a30595cc;hb=1280ba2e51b36f417f3adb6d101405ee75e7e509;hpb=52d3cad4f744140e1aa06fdfc0d49a0cf8734fd4

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index b97c8dc6..9d575e4c 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -28,7 +28,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		JLabel		label;
 		JTextField	value;
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
@@ -64,8 +64,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	}
 
 	class Call extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(state.data.callsign);
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(state.callsign);
 		}
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
@@ -75,8 +75,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Call call;
 
 	class Serial extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.serial));
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.serial == AltosLib.MISSING)
+				value.setText("none");
+			else
+				value.setText(String.format("%d", state.serial));
 		}
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
@@ -86,8 +89,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Serial serial;
 
 	class Flight extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.flight));
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.flight == AltosLib.MISSING)
+				value.setText("none");
+			else
+				value.setText(String.format("%d", state.flight));
 		}
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
@@ -97,8 +103,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Flight flight;
 
 	class FlightState extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(state.data.state());
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(state.state_name());
 		}
 		public FlightState (GridBagLayout layout, int x) {
 			super (layout, x, "State");
@@ -108,8 +114,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	FlightState flight_state;
 
 	class RSSI extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.rssi));
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(String.format("%d", state.rssi()));
 		}
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
@@ -119,8 +125,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	RSSI rssi;
 
 	class LastPacket extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			long secs = (System.currentTimeMillis() - state.report_time + 500) / 1000;
+		void show(AltosState state, AltosListenerState listener_state) {
+			long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
 			value.setText(String.format("%d", secs));
 		}
 		public LastPacket(GridBagLayout layout, int x) {
@@ -148,13 +154,13 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		last_packet.set_font();
 	}
 
-	public void show (AltosState state, int crc_errors) {
-		call.show(state, crc_errors);
-		serial.show(state, crc_errors);
-		flight.show(state, crc_errors);
-		flight_state.show(state, crc_errors);
-		rssi.show(state, crc_errors);
-		last_packet.show(state, crc_errors);
+	public void show (AltosState state, AltosListenerState listener_state) {
+		call.show(state, listener_state);
+		serial.show(state, listener_state);
+		flight.show(state, listener_state);
+		flight_state.show(state, listener_state);
+		rssi.show(state, listener_state);
+		last_packet.show(state, listener_state);
 	}
 
 	public int height() {