X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=2ff768700e029960dfe38e41a9b7d8d6f6708d5d;hp=c0d3312b8b71cf4d81c9f15541ce32a2153af55b;hb=e4407afb514437ccd8db79ae29c6fa203140fa07;hpb=4231d68bae69d9a7d1f52205002db452cd5f986d

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index c0d3312b..2ff76870 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.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
@@ -19,8 +20,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -92,14 +93,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		}
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (!same_call(state.callsign)) {
+			if (!same_call(state.cal_data.callsign)) {
 				show();
-				value.setText(state.callsign);
-				if (state.callsign == null)
+				value.setText(state.cal_data.callsign);
+				if (state.cal_data.callsign == null)
 					setVisible(false);
 				else
 					setVisible(true);
-				last_call = state.callsign;
+				last_call = state.cal_data.callsign;
 			}
 		}
 
@@ -119,13 +120,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 		int	last_serial = -1;
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.serial != last_serial) {
+			AltosCalData	cal_data = state.cal_data;
+			if (cal_data.serial != last_serial) {
 				show();
-				if (state.serial == AltosLib.MISSING)
+				if (cal_data.serial == AltosLib.MISSING)
 					value.setText("none");
 				else
-					value.setText(String.format("%d", state.serial));
-				last_serial = state.serial;
+					value.setText(String.format("%d", cal_data.serial));
+				last_serial = cal_data.serial;
 			}
 		}
 
@@ -146,13 +148,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		int	last_flight = -1;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.flight != last_flight) {
+			AltosCalData cal_data = state.cal_data;
+			if (cal_data.flight != last_flight) {
 				show();
-				if (state.flight == AltosLib.MISSING)
+				if (cal_data.flight == AltosLib.MISSING)
 					value.setText("none");
 				else
-					value.setText(String.format("%d", state.flight));
-				last_flight = state.flight;
+					value.setText(String.format("%d", cal_data.flight));
+				last_flight = cal_data.flight;
 			}
 		}
 
@@ -173,14 +176,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		int	last_state = -1;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.state != last_state) {
-				if (state.state == AltosLib.ao_flight_stateless)
+			if (state.state() != last_state) {
+				if (state.state() == AltosLib.ao_flight_stateless)
 					hide();
 				else {
 					show();
 					value.setText(state.state_name());
 				}
-				last_state = state.state;
+				last_state = state.state();
 			}
 		}