X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosScanUI.java;h=2b9137d80c4f2c1d47301cf4631556f64560e758;hb=97663f922e236f4ee7bd08277ca80d419b5cd10f;hp=bce4b32c9ef02e19db030e33eb77a5e5a2558005;hpb=4d94e8f9f807a0bbeab0cdead011e74eeca1d1b6;p=fw%2Faltos

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index bce4b32c..2b9137d8 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -102,7 +102,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends JDialog
+	extends AltosDialog
 	implements ActionListener
 {
 	AltosUI				owner;
@@ -130,8 +130,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) {
@@ -268,7 +267,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")) {
@@ -326,8 +325,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 +359,7 @@ public class AltosScanUI
 
 		owner = in_owner;
 
-		frequencies = AltosPreferences.common_frequencies();
+		frequencies = AltosUIPreferences.common_frequencies();
 		frequency_index = 0;
 		telemetry = Altos.ao_telemetry_min;
 
@@ -402,7 +400,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;