Merge branch 'master' into new-state

[fw/altos] / altosui / AltosCompanionInfo.java

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 8ccccfac904ef85f118097bb9e8a4b54a519dbc9..1ed2c425b4196acc6b5e9aaec53c10f7e18d6c26 100644 (file)
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosCompanionInfo extends JTable {
        private AltosFlightInfoTableModel model;
@@ -83,11 +83,11 @@ public class AltosCompanionInfo extends JTable {
                }
        }
        
-       public void show(AltosState state, int crc_errors) {
+       public void show(AltosState state, AltosListenerState listener_state) {
                if (state == null)
                        return;
-               if (state.data.companion != null)
-                       companion = state.data.companion;
+               if (state.companion != null)
+                       companion = state.companion;
                info_reset();
                info_add_row(0, "Companion board", "%s", board_name());
                if (companion != null) {