Get AltOS version numbers into Mac 'about' dialog

[fw/altos] / altosui / AltosScanUI.java

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index e188834e64aa76a204d8026a42324273b800c29a..44eeda6dcc83ff228c21efe0415a1bf4f7de5bfa 100644 (file)
--- 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;
@@ -207,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 ||
@@ -223,7 +224,7 @@ public class AltosScanUI
                }
                set_frequency();
                set_label();
-               reader.serial.set_monitor(true);
+               reader.set_monitor(true);
        }
 
 
@@ -267,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")) {
@@ -311,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 {
@@ -359,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;
 
@@ -400,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;