projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include TeleMega v3.0 firmware with releases
[fw/altos]
/
altosui
/
AltosFlightStatus.java
diff --git
a/altosui/AltosFlightStatus.java
b/altosui/AltosFlightStatus.java
index 2ff768700e029960dfe38e41a9b7d8d6f6708d5d..a5e5a4efec4fea8fae1f2dd3f78c9539145e492d 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
2
.*;
+import org.altusmetrum.altosuilib_1
2
.*;
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.cal_data.callsign)) {
+ if (!same_call(state.cal_data
()
.callsign)) {
show();
show();
- value.setText(state.cal_data.callsign);
- if (state.cal_data.callsign == null)
+ value.setText(state.cal_data
()
.callsign);
+ if (state.cal_data
()
.callsign == null)
setVisible(false);
else
setVisible(true);
setVisible(false);
else
setVisible(true);
- last_call = state.cal_data.callsign;
+ last_call = state.cal_data
()
.callsign;
}
}
}
}
@@
-120,7
+120,7
@@
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) {
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data
()
;
if (cal_data.serial != last_serial) {
show();
if (cal_data.serial == AltosLib.MISSING)
if (cal_data.serial != last_serial) {
show();
if (cal_data.serial == AltosLib.MISSING)
@@
-148,7
+148,7
@@
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) {
- AltosCalData cal_data = state.cal_data;
+ AltosCalData cal_data = state.cal_data
()
;
if (cal_data.flight != last_flight) {
show();
if (cal_data.flight == AltosLib.MISSING)
if (cal_data.flight != last_flight) {
show();
if (cal_data.flight == AltosLib.MISSING)