X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCompanionInfo.java;h=1f446700218827c64ff1ff6673df8cf1654f2156;hp=16c972b36ceca006ec6b7b23001ecb29e0cebdd2;hb=488a527267decece48e6682e0e0c7fc29cbed329;hpb=708e7937cba52982b91244cf89bfbff46d346135

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 16c972b3..1f446700 100644
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -15,19 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+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;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
 
 public class AltosCompanionInfo extends JTable {
 	private AltosFlightInfoTableModel model;
@@ -78,24 +70,24 @@ 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;
+		if (state.companion != null)
+			companion = state.companion;
 		info_reset();
 		info_add_row(0, "Companion board", "%s", board_name());
 		if (companion != null) {