projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos-mapd: Make cache service listen queue longer
[fw/altos]
/
altosui
/
AltosFlightStatus.java
diff --git
a/altosui/AltosFlightStatus.java
b/altosui/AltosFlightStatus.java
index 4288fc9feea97c9d647285b82a4e687356f7b7d9..207c44b48da275e086944f5b1dbef1521fb254e1 100644
(file)
--- a/
altosui/AltosFlightStatus.java
+++ b/
altosui/AltosFlightStatus.java
@@
-20,8
+20,8
@@
package altosui;
import java.awt.*;
import javax.swing.*;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_1
1
.*;
-import org.altusmetrum.altosuilib_1
1
.*;
+import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altosuilib_1
3
.*;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
@@
-93,14
+93,14
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
}
void show(AltosState state, AltosListenerState listener_state) {
}
void show(AltosState state, AltosListenerState listener_state) {
- if (!same_call(state.callsign)) {
+ if (!same_call(state.cal
_data().cal
lsign)) {
show();
show();
- value.setText(state.callsign);
- if (state.callsign == null)
+ value.setText(state.cal
_data().cal
lsign);
+ if (state.cal
_data().cal
lsign == null)
setVisible(false);
else
setVisible(true);
setVisible(false);
else
setVisible(true);
- last_call = state.callsign;
+ last_call = state.cal
_data().cal
lsign;
}
}
}
}
@@
-120,13
+120,14
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
int last_serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
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();
show();
- if (
state
.serial == AltosLib.MISSING)
+ if (
cal_data
.serial == AltosLib.MISSING)
value.setText("none");
else
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;
}
}
}
}
@@
-147,13
+148,14
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
int last_flight = -1;
void show(AltosState state, AltosListenerState listener_state) {
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();
show();
- if (
state
.flight == AltosLib.MISSING)
+ if (
cal_data
.flight == AltosLib.MISSING)
value.setText("none");
else
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;
}
}
}
}