projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Rename easymini-v0.1 to easymini-v1.0
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index 6d010d23c14129ae53bc42ddc5149757d51e8db7..c151177e73e1915fae355b66fc9939ff33507b56 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-21,7
+21,7
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
import org.altusmetrum.altosuilib_1.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
@@
-102,7
+102,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
status_update.saved_state = state;
if (state == null)
status_update.saved_state = state;
if (state == null)
- state = new AltosState(
new AltosRecord()
);
+ state = new AltosState();
pad.show(state, listener_state);
pad.show(state, listener_state);
@@
-130,7
+130,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
- if (state.
data.
companion != null) {
+ if (state.companion != null) {
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;
if (!has_companion) {
pane.add("Companion", companion);
has_companion= true;