X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCompanionInfo.java;h=f8d033a82f4825495d830f579cd5fbffef5b5fa9;hp=82bde62355345da96feca7b7a1d27d57ef21e533;hb=71715337eb532a1fbe1a753240e7417d5223489f;hpb=cbfbaabb39f9f7709d00cf3dc63cc1bc7563062e

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 82bde623..f8d033a8 100644
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -18,17 +18,11 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class AltosCompanionInfo extends JTable {
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
+
+public class AltosCompanionInfo extends JTable implements AltosFlightDisplay {
 	private AltosFlightInfoTableModel model;
 
 	static final int info_columns = 2;
@@ -57,7 +51,7 @@ public class AltosCompanionInfo extends JTable {
 		return getPreferredSize();
 	}
 
-	void info_reset() {
+	public void reset() {
 		model.reset();
 	}
 
@@ -77,25 +71,25 @@ public class AltosCompanionInfo extends JTable {
 		model.clear();
 	}
 
-	AltosRecordCompanion	companion;
+	AltosCompanion	companion;
 
 	public String board_name() {
 		if (companion == null)
 			return "None";
 		switch (companion.board_id) {
-		case AltosRecordCompanion.board_id_telescience:
+		case AltosCompanion.board_id_telescience:
 			return "TeleScience";
 		default:
 			return String.format("%02x\n", companion.board_id);
 		}
 	}
-	
-	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;
-		info_reset();
+		if (state.companion != null)
+			companion = state.companion;
+		reset();
 		info_add_row(0, "Companion board", "%s", board_name());
 		if (companion != null) {
 			info_add_row(0, "Last Data", "%5d", companion.tick);