altosui/telegps: Undo the frequency/telemetry menu changes

[fw/altos] / altosui / AltosConfigTDUI.java

diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index 125780a99f9813c723677080e4802c8b383eb36e..947d78ee1815adf8ef8c9e2ffcf81a408a68224f 100644 (file)
--- a/altosui/AltosConfigTDUI.java
+++ b/altosui/AltosConfigTDUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosConfigTDUI
        extends AltosUIDialog
@@ -44,7 +44,7 @@ public class AltosConfigTDUI
        JLabel          product_value;
        JLabel          version_value;
        JLabel          serial_value;
-       AltosFreqList   radio_frequency_value;
+       AltosUIFreqList radio_frequency_value;
        JLabel          radio_calibration_value;
 
        JButton         save;
@@ -54,7 +54,6 @@ public class AltosConfigTDUI
 
        ActionListener  listener;
 
-
        /* A window listener to catch closing events and tell the config code */
        class ConfigListener extends WindowAdapter {
                AltosConfigTDUI ui;
@@ -166,7 +165,7 @@ public class AltosConfigTDUI
                c.anchor = GridBagConstraints.LINE_START;
                c.insets = ir;
                c.ipady = 5;
-               radio_frequency_value = new AltosFreqList();
+               radio_frequency_value = new AltosUIFreqList();
                radio_frequency_value.addItemListener(this);
                pane.add(radio_frequency_value, c);
                radio_frequency_value.setToolTipText("Telemetry, RDF and packet frequency");
@@ -311,7 +310,7 @@ public class AltosConfigTDUI
                int i;
                for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
                        AltosFrequency  f = (AltosFrequency) radio_frequency_value.getItemAt(i);
-                       
+
                        if (f.close(new_radio_frequency)) {
                                radio_frequency_value.setSelectedIndex(i);
                                return;
@@ -319,7 +318,7 @@ public class AltosConfigTDUI
                }
                for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
                        AltosFrequency  f = (AltosFrequency) radio_frequency_value.getItemAt(i);
-                       
+
                        if (new_radio_frequency < f.frequency)
                                break;
                }