projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosuilib/altosui: More work towards using AltosFlightSeries for analysis
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index 3d33b6e55ca98bd90f47ce4b19af0a2c156f9b43..eaf19256c57ff8bdffde39c029d5e337a746ecaf 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-36,7
+36,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JTabbedPane pane;
AltosPad pad;
JTabbedPane pane;
AltosPad pad;
- AltosIgnitor ignit
o
r;
+ AltosIgnitor ignit
e
r;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
@@
-45,7
+45,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
boolean has_map;
boolean has_companion;
boolean has_state;
boolean has_map;
boolean has_companion;
boolean has_state;
- boolean has_ignit
o
r;
+ boolean has_ignit
e
r;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-121,15
+121,15
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
cur_tab = tab;
}
cur_tab = tab;
}
- if (ignit
o
r.should_show(state)) {
- if (!has_ignit
o
r) {
- pane.add("Ignitor", ignit
o
r);
- has_ignit
o
r = true;
+ if (ignit
e
r.should_show(state)) {
+ if (!has_ignit
e
r) {
+ pane.add("Ignitor", ignit
e
r);
+ has_ignit
e
r = true;
}
} else {
}
} else {
- if (has_ignit
o
r) {
- pane.remove(ignit
o
r);
- has_ignit
o
r = false;
+ if (has_ignit
e
r) {
+ pane.remove(ignit
e
r);
+ has_ignit
e
r = false;
}
}
}
}
@@
-272,8
+272,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
displays.add(pad);
pane.add("Status", pad);
displays.add(pad);
pane.add("Status", pad);
- ignit
o
r = new AltosIgnitor();
- displays.add(ignit
o
r);
+ ignit
e
r = new AltosIgnitor();
+ displays.add(ignit
e
r);
ascent = new AltosAscent();
displays.add(ascent);
descent = new AltosDescent();
ascent = new AltosAscent();
displays.add(ascent);
descent = new AltosDescent();