altosui: Fix channel changing in flight UI to actually work

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

diff --git a/ao-tools/altosui/AltosChannelMenu.java b/ao-tools/altosui/AltosChannelMenu.java
index 504c13c6273c5ee366b56313463c4ea5a7e4ba2e..abbb86f43c31ea56e75b6cd6e5a48b11e18a5a24 100644 (file)
--- a/ao-tools/altosui/AltosChannelMenu.java
+++ b/ao-tools/altosui/AltosChannelMenu.java
@@ -28,43 +28,17 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-public class AltosChannelMenu extends JMenu implements ActionListener {
-       ButtonGroup                     group;
+public class AltosChannelMenu extends JComboBox implements ActionListener {
        int                             channel;
-       LinkedList<ActionListener>      listeners;
-
-       public void addActionListener(ActionListener l) {
-               listeners.add(l);
-       }
-
-       public void actionPerformed(ActionEvent e) {
-               channel = Integer.parseInt(e.getActionCommand());
-
-               ListIterator<ActionListener>    i = listeners.listIterator();
-
-               ActionEvent newe = new ActionEvent(this, channel, e.getActionCommand());
-               while (i.hasNext()) {
-                       ActionListener  listener = i.next();
-                       listener.actionPerformed(newe);
-               }
-       }
 
        public AltosChannelMenu(int current_channel) {
-               super("Channel", true);
-               group = new ButtonGroup();
 
                channel = current_channel;
 
-               listeners = new LinkedList<ActionListener>();
-               for (int c = 0; c <= 9; c++) {
-                       JRadioButtonMenuItem radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
-                                                                                               434.550 + c * 0.1),
-                                                            c == channel);
-                       radioitem.setActionCommand(String.format("%d", c));
-                       radioitem.addActionListener(this);
-                       add(radioitem);
-                       group.add(radioitem);
-               }
+               for (int c = 0; c <= 9; c++)
+                       addItem(String.format("Channel %1d (%7.3fMHz)", c, 434.550 + c * 0.1));
+               setSelectedIndex(channel);
+               setMaximumRowCount(10);
        }
 
 }