diff options
| author | Keith Packard <keithp@keithp.com> | 2013-08-29 19:24:51 -0500 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-08-29 19:24:51 -0500 | 
| commit | de8d9c5630ae46378c50faf97f7d2e97fe139e30 (patch) | |
| tree | e8e41e4186c5d27e1a5184d915bdb9f08926fa7a /altosui/AltosFlightStatus.java | |
| parent | ce1378385ef273010498e81c205f42d8e32c7dc1 (diff) | |
altoslib, altosui: Restructured state management now does TM eeprom files
Removed uses of AltosRecord from AltosState, now just need to rewrite
the other AltosState changing code to match
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui/AltosFlightStatus.java')
| -rw-r--r-- | altosui/AltosFlightStatus.java | 14 | 
1 files changed, 7 insertions, 7 deletions
diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java index d2910414..0be7bb51 100644 --- a/altosui/AltosFlightStatus.java +++ b/altosui/AltosFlightStatus.java @@ -65,7 +65,7 @@ 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);  		}  		public Call (GridBagLayout layout, int x) {  			super (layout, x, "Callsign"); @@ -76,10 +76,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 == AltosRecord.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 +90,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 == AltosRecord.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 +104,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 +115,7 @@ 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()));  		}  		public RSSI (GridBagLayout layout, int x) {  			super (layout, x, "RSSI");  | 
