X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosScanUI.java;h=44eeda6dcc83ff228c21efe0415a1bf4f7de5bfa;hp=dd6672aa29886a41ebea1140dc0eb9d9f8d918b2;hb=675ccd41e3b668cd4e1d2dd282dd317a00d00151;hpb=cbf54a826d12c49b1b1996be247869d5ff4e2236

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index dd6672aa..44eeda6d 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -28,6 +28,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class AltosScanResult {
 	String		callsign;
@@ -102,7 +103,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends JDialog
+	extends AltosDialog
 	implements ActionListener
 {
 	AltosUI				owner;
@@ -130,8 +131,7 @@ public class AltosScanUI
 	void scan_exception(Exception e) {
 		if (e instanceof FileNotFoundException) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ((FileNotFoundException) e).getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} else if (e instanceof AltosSerialInUseException) {
@@ -208,7 +208,7 @@ public class AltosScanUI
 	}
 	
 	void next() throws InterruptedException, TimeoutException {
-		reader.serial.set_monitor(false);
+		reader.set_monitor(false);
 		Thread.sleep(100);
 		++frequency_index;
 		if (frequency_index >= frequencies.length ||
@@ -224,7 +224,7 @@ public class AltosScanUI
 		}
 		set_frequency();
 		set_label();
-		reader.serial.set_monitor(true);
+		reader.set_monitor(true);
 	}
 
 
@@ -268,7 +268,7 @@ public class AltosScanUI
 					scanning_telemetry |= (1 << Altos.ao_telemetry_standard);
 					telemetry_boxes[Altos.ao_telemetry_standard - Altos.ao_telemetry_min].setSelected(true);
 				}
-				AltosPreferences.set_scanning_telemetry(scanning_telemetry);
+				AltosUIPreferences.set_scanning_telemetry(scanning_telemetry);
 			}
 
 			if (cmd.equals("monitor")) {
@@ -312,7 +312,7 @@ public class AltosScanUI
 		if (device == null)
 			return false;
 		try {
-			reader = new AltosTelemetryReader(device);
+			reader = new AltosTelemetryReader(new AltosSerial(device));
 			set_frequency();
 			set_telemetry();
 			try {
@@ -326,8 +326,7 @@ public class AltosScanUI
 			return true;
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ee.getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
@@ -361,7 +360,7 @@ public class AltosScanUI
 
 		owner = in_owner;
 
-		frequencies = AltosPreferences.common_frequencies();
+		frequencies = AltosUIPreferences.common_frequencies();
 		frequency_index = 0;
 		telemetry = Altos.ao_telemetry_min;
 
@@ -386,7 +385,7 @@ public class AltosScanUI
 		
 		set_label();
 
-		c.fill = GridBagConstraints.NONE;
+		c.fill = GridBagConstraints.HORIZONTAL;
 		c.anchor = GridBagConstraints.WEST;
 		c.insets = i;
 		c.weightx = 1;
@@ -402,7 +401,7 @@ public class AltosScanUI
 		c.gridy = 2;
 		pane.add(telemetry_label, c);
 
-		int	scanning_telemetry = AltosPreferences.scanning_telemetry();
+		int	scanning_telemetry = AltosUIPreferences.scanning_telemetry();
 		telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
 		for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
 			int j = k - Altos.ao_telemetry_min;