X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=a5ccb15aac379a6d6cb82dc8a0a4850b8eb567f0;hp=534451cb969057a34559da6759431ee1bc12cc75;hb=1280ba2e51b36f417f3adb6d101405ee75e7e509;hpb=708e7937cba52982b91244cf89bfbff46d346135

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 534451cb..a5ccb15a 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -15,20 +15,18 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -124,7 +122,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosUI				owner;
@@ -186,13 +184,13 @@ public class AltosScanUI
 			try {
 				for (;;) {
 					try {
-						AltosRecord	record = reader.read();
-						if (record == null)
+						AltosState	state = reader.read();
+						if (state == null)
 							continue;
-						if ((record.seen & AltosRecord.seen_flight) != 0) {
-							final AltosScanResult	result = new AltosScanResult(record.callsign,
-												     record.serial,
-												     record.flight,
+						if (state.flight != AltosLib.MISSING) {
+							final AltosScanResult	result = new AltosScanResult(state.callsign,
+												     state.serial,
+												     state.flight,
 												     frequencies[frequency_index],
 												     telemetry);
 							Runnable r = new Runnable() {
@@ -330,7 +328,7 @@ public class AltosScanUI
 	}
 
 	private boolean open() {
-		device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+		device = AltosDeviceUIDialog.show(owner, Altos.product_basestation);
 		if (device == null)
 			return false;
 		try {