projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: Handle USB reset in STM32L usb driver
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index 009ba4adafb3eab42b2c17cd46c93bff3ab2cb16..63f8c670762794c174946dc27f834dfb151f6906 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-22,8
+22,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.util.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
7
.*;
-import org.altusmetrum.altosuilib_
7
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosVoice voice;
@@
-40,7
+40,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
AltosDescent descent;
AltosLanded landed;
AltosCompanionInfo companion;
AltosDescent descent;
AltosLanded landed;
AltosCompanionInfo companion;
- AltosUIMap
New
sitemap;
+ AltosUIMap sitemap;
boolean has_map;
boolean has_companion;
boolean has_state;
boolean has_map;
boolean has_companion;
boolean has_state;
@@
-53,13
+53,13
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
JComponent cur_tab = null;
JComponent which_tab(AltosState state) {
JComponent cur_tab = null;
JComponent which_tab(AltosState state) {
- if (state.state < Altos.ao_flight_boost)
+ if (state.state
()
< Altos.ao_flight_boost)
return pad;
return pad;
- if (state.state <= Altos.ao_flight_coast)
+ if (state.state
()
<= Altos.ao_flight_coast)
return ascent;
return ascent;
- if (state.state <= Altos.ao_flight_main)
+ if (state.state
()
<= Altos.ao_flight_main)
return descent;
return descent;
- if (state.state == AltosLib.ao_flight_stateless)
+ if (state.state
()
== AltosLib.ao_flight_stateless)
return descent;
return landed;
}
return descent;
return landed;
}
@@
-102,7
+102,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
if (state == null)
state = new AltosState();
if (state == null)
state = new AltosState();
- if (state.state != Altos.ao_flight_startup) {
+ if (state.state
()
!= Altos.ao_flight_startup) {
if (!has_state) {
pane.setTitleAt(0, "Launch Pad");
pane.add(ascent, 1);
if (!has_state) {
pane.setTitleAt(0, "Launch Pad");
pane.add(ascent, 1);
@@
-289,7
+289,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
has_companion = false;
has_state = false;
has_companion = false;
has_state = false;
- sitemap = new AltosUIMap
New
();
+ sitemap = new AltosUIMap();
displays.add(sitemap);
has_map = false;
displays.add(sitemap);
has_map = false;