altos: Use installed pdclib

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 6b258f2e7eb31f0a1ec0b748b69e565e2004fe3c..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 org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
@@ -101,10 +101,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
        public void show(AltosState state, AltosListenerState listener_state) {
                status_update.saved_state = state;
 
-               if (state == null) {
-                       System.out.printf ("no state provided\n");
-                       state = new AltosState(new AltosRecord());
-               }
+               if (state == null)
+                       state = new AltosState();
 
                pad.show(state, listener_state);
 
@@ -132,7 +130,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
                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;