altosui: Make Windows java test "smarter"

[fw/altos] / altosui / AltosCompanionInfo.java

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index f2019438d421b7ba6d8647b305a32265b8a2c6b8..7ac53dd8ca9418ceb56cb184ffff4cbdca4e4c59 100644 (file)
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -19,9 +19,10 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
-public class AltosCompanionInfo extends JTable {
+public class AltosCompanionInfo extends JTable implements AltosFlightDisplay {
        private AltosFlightInfoTableModel model;
 
        static final int info_columns = 2;
@@ -32,25 +33,28 @@ public class AltosCompanionInfo extends JTable {
                return (infoValueMetrics.getHeight() + infoValueMetrics.getLeading()) * 18 / 10;
        }
 
-       public void set_font() {
+       public void font_size_changed(int font_size) {
                setFont(Altos.table_value_font);
                setRowHeight(desired_row_height());
                doLayout();
        }
 
+       public void units_changed(boolean imperial_units) {
+       }
+
        public AltosCompanionInfo() {
                super(new AltosFlightInfoTableModel(info_rows, info_columns));
                model = (AltosFlightInfoTableModel) getModel();
                setAutoResizeMode(AUTO_RESIZE_ALL_COLUMNS);
                setShowGrid(true);
-               set_font();
+               font_size_changed(AltosUIPreferences.font_size());
        }
 
        public Dimension getPreferredScrollableViewportSize() {
                return getPreferredSize();
        }
 
-       void info_reset() {
+       public void reset() {
                model.reset();
        }
 
@@ -70,25 +74,27 @@ 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 String getName() { return "Companion"; }
+
+       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);