From: Keith Packard <keithp@keithp.com>
Date: Sat, 20 Nov 2010 08:13:58 +0000 (-0800)
Subject: altosui: Fix channel changing in flight UI to actually work
X-Git-Tag: debian/0.7.1+76+g9a99cab~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9a99cabc1c34c657fc95246192ba6d330f5f22d3;hp=-c

altosui: Fix channel changing in flight UI to actually work

Replacing the menu with a combo box required reworking the way events
are delivered from that widget back to the channel changing
function. Just delete the old magic and use the JComboBox action
listener directly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

9a99cabc1c34c657fc95246192ba6d330f5f22d3
diff --git a/ao-tools/altosui/AltosChannelMenu.java b/ao-tools/altosui/AltosChannelMenu.java
index 8069c853..abbb86f4 100644
--- a/ao-tools/altosui/AltosChannelMenu.java
+++ b/ao-tools/altosui/AltosChannelMenu.java
@@ -30,31 +30,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 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 = getSelectedIndex();
-
-		ActionEvent newe = new ActionEvent(this, channel, e.getActionCommand());
-
-		ListIterator<ActionListener>	i = listeners.listIterator();
-
-		while (i.hasNext()) {
-			ActionListener	listener = i.next();
-			listener.actionPerformed(newe);
-		}
-		setMaximumSize(getPreferredSize());
-	}
 
 	public AltosChannelMenu(int current_channel) {
 
 		channel = current_channel;
 
-		listeners = new LinkedList<ActionListener>();
 		for (int c = 0; c <= 9; c++)
 			addItem(String.format("Channel %1d (%7.3fMHz)", c, 434.550 + c * 0.1));
 		setSelectedIndex(channel);
diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 56ab7ebc..ac88aa15 100644
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -127,6 +127,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 	}
 
 	Container	bag;
+	JComboBox	channels;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
 		AltosPreferences.init(this);
@@ -147,10 +148,10 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
 		if (serial >= 0) {
 			// Channel menu
-			JComboBox channels = new AltosChannelMenu(AltosPreferences.channel(serial));
+			channels = new AltosChannelMenu(AltosPreferences.channel(serial));
 			channels.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						int channel = Integer.parseInt(e.getActionCommand());
+						int channel = channels.getSelectedIndex();
 						reader.set_channel(channel);
 						AltosPreferences.set_channel(serial, channel);
 					}