X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=b467bbdee4d8b2154dc7f134e4cb58354ecafea5;hp=d2910414dec132af46e4fecb4e168052068073af;hb=238ddde1ffdb8521d06519306cfb76271ae552b9;hpb=398c02b945a58634c8932f07df2c2be8438da7d1

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index d2910414..b467bbde 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_1.*;
+import org.altusmetrum.altoslib_3.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -39,6 +39,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 			value.setFont(Altos.status_font);
 		}
 
+		void setVisible(boolean visible) {
+			label.setVisible(visible);
+			value.setVisible(visible);
+		}
+
 		public FlightValue (GridBagLayout layout, int x, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.insets = new Insets(5, 5, 5, 5);
@@ -65,7 +70,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class Call extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(state.data.callsign);
+			value.setText(state.callsign);
+			if (state.callsign == null)
+				setVisible(false);
+			else
+				setVisible(true);
 		}
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
@@ -76,10 +85,10 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class Serial extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.data.serial == AltosRecord.MISSING)
+			if (state.serial == AltosLib.MISSING)
 				value.setText("none");
 			else
-				value.setText(String.format("%d", state.data.serial));
+				value.setText(String.format("%d", state.serial));
 		}
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
@@ -90,10 +99,10 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class Flight extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.data.flight == AltosRecord.MISSING)
+			if (state.flight == AltosLib.MISSING)
 				value.setText("none");
 			else
-				value.setText(String.format("%d", state.data.flight));
+				value.setText(String.format("%d", state.flight));
 		}
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
@@ -104,7 +113,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class FlightState extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(state.data.state());
+			value.setText(state.state_name());
 		}
 		public FlightState (GridBagLayout layout, int x) {
 			super (layout, x, "State");
@@ -115,7 +124,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class RSSI extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(String.format("%d", state.data.rssi));
+			value.setText(String.format("%d", state.rssi()));
+			if (state.rssi == AltosLib.MISSING)
+				setVisible(false);
+			else
+				setVisible(true);
 		}
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
@@ -126,7 +139,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 	class LastPacket extends FlightValue {
 		void show(AltosState state, AltosListenerState listener_state) {
-			long secs = (System.currentTimeMillis() - state.report_time + 500) / 1000;
+			long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
 			value.setText(String.format("%d", secs));
 		}
 		public LastPacket(GridBagLayout layout, int x) {