Update java library version numbers

[fw/altos] / altosuilib / AltosInfoTable.java

diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java
index 625fe76f6ff33f09416490b057f3fc99a97e4be6..3833b37ae38e13e16933894dd1b5c56dd04260bc 100644 (file)
--- a/altosuilib/AltosInfoTable.java
+++ b/altosuilib/AltosInfoTable.java
@@ -15,13 +15,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_3;
+package org.altusmetrum.altosuilib_10;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_10.*;
 
 public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener {
        private AltosFlightInfoTableModel model;
@@ -137,6 +137,8 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
                if (state != null) {
                        if (state.device_type != AltosLib.MISSING)
                                info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type));
+                       else if (state.product != null)
+                               info_add_row(0, "Device", "%s", state.product);
                        if (state.altitude() != AltosLib.MISSING)
                                info_add_row(0, "Altitude", "%6.0f    m", state.altitude());
                        if (state.ground_altitude() != AltosLib.MISSING)
@@ -207,7 +209,7 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar
                                                     state.gps.climb_rate);
 
                                if (state.gps.h_error != AltosLib.MISSING && state.gps.v_error != AltosLib.MISSING)
-                                       info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
+                                       info_add_row(1, "GPS error", "%6.0f m(h)%6.0f m(v)",
                                                     state.gps.h_error, state.gps.v_error);
                                if (state.gps.pdop != AltosLib.MISSING &&
                                    state.gps.hdop != AltosLib.MISSING &&