projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add STM SPI debugging
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index 939c468852efebc0885ba0fdb5e7aefb9b6f75f5..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_
8
.*;
-import org.altusmetrum.altosuilib_
8
.*;
+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;
@@
-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;