X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosScanUI.java;h=fad1b2cde8ce72f9b7c4f2dec9cd5b734707804f;hp=e2efd4b348049a0367b603b2b296f776d52c18e5;hb=297eb795b24ec31f6599f48bc8c3769557a7ec6f;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index e2efd4b3..fad1b2cd 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_8;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -25,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altoslib_13.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -212,10 +213,11 @@ public class AltosScanUI
 						if (state == null)
 							continue;
 						packet_count++;
-						if (state.flight != AltosLib.MISSING) {
-							final AltosScanResult	result = new AltosScanResult(state.callsign,
-													     state.serial,
-													     state.flight,
+						AltosCalData	cal_data = state.cal_data();
+						if (cal_data.flight != AltosLib.MISSING) {
+							final AltosScanResult	result = new AltosScanResult(cal_data.callsign,
+													     cal_data.serial,
+													     cal_data.flight,
 													     frequencies[frequency_index],
 													     telemetry,
 													     rate);