X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosScanUI.java;h=c63f027c12d7c0de1e12a95475937feae6d2ae77;hb=debian;hp=ad53f66ba20c63cce431c76863b3c7570f013b9f;hpb=e6eb659b0e984515a33b3ddabfe8325742a952da;p=fw%2Faltos

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index ad53f66b..4ec858fa 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -26,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_14.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -213,10 +213,11 @@ public class AltosScanUI
 						if (state == null)
 							continue;
 						packet_count++;
-						if (reader.cal_data.flight != AltosLib.MISSING) {
-							final AltosScanResult	result = new AltosScanResult(reader.cal_data.callsign,
-													     reader.cal_data.serial,
-													     reader.cal_data.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);
@@ -469,7 +470,7 @@ public class AltosScanUI
 		if (!open())
 			return;
 
-		Container		pane = getContentPane();
+		Container		pane = getScrollablePane();
 		GridBagConstraints	c = new GridBagConstraints();
 		Insets			i = new Insets(4,4,4,4);