X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosInfoTable.java;h=7ede28244e5f8748e0ba3b800b8a0c313883fb0f;hb=d318b5cfc1a0312697739576d35cc1a190d88849;hp=91cc43bb29541bea306232b90dd10ab409996bb3;hpb=2313cdacefb2139bc68cd98e782c54d706af0704;p=fw%2Faltos diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java index 91cc43bb..7ede2824 100644 --- a/altosuilib/AltosInfoTable.java +++ b/altosuilib/AltosInfoTable.java @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,13 +16,13 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altosuilib_3; +package org.altusmetrum.altosuilib_11; import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.table.*; -import org.altusmetrum.altoslib_5.*; +import org.altusmetrum.altoslib_11.*; public class AltosInfoTable extends JTable implements AltosFlightDisplay, HierarchyListener { private AltosFlightInfoTableModel model; @@ -137,6 +138,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)