altosui: Eliminate unncessary import altosui lines

[fw/altos] / ao-tools / altosui / AltosEepromDownload.java

diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 6dbbd3ebb8c3477e8b41250cb39ab529a501272e..bd9e4b4853920297569fdb7f6baa818f1b593d9d 100644 (file)
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -28,18 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
 import libaltosJNI.*;
 
 public class AltosEepromDownload implements Runnable {
@@ -224,7 +212,7 @@ public class AltosEepromDownload implements Runnable {
 
        public void run () {
                if (remote) {
-                       serial_line.set_channel(AltosPreferences.channel());
+                       serial_line.set_channel(AltosPreferences.channel(device.getSerial()));
                        serial_line.set_callsign(AltosPreferences.callsign());
                        serial_line.printf("p\nE 0\n");
                        serial_line.flush_input();
@@ -254,7 +242,7 @@ public class AltosEepromDownload implements Runnable {
 
        public AltosEepromDownload(JFrame given_frame) {
                frame = given_frame;
-               device = AltosDeviceDialog.show(frame, AltosDevice.Any);
+               device = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
                serial_line = new AltosSerial();
                remote = false;
@@ -262,7 +250,7 @@ public class AltosEepromDownload implements Runnable {
                if (device != null) {
                        try {
                                serial_line.open(device);
-                               if (!device.matchProduct(AltosDevice.TeleMetrum))
+                               if (!device.matchProduct(AltosDevice.product_telemetrum))
                                        remote = true;
                                eeprom_thread = new Thread(this);
                                eeprom_thread.start();