AltosSiteMap: add autoscroll and grabndrag scroll

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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 21b41528b32a056aee22989167cbead46b506425..c85fc9776259a150d5eabd8f1ed4ea46de08bb7e 100644 (file)
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -46,7 +46,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
 
        private AltosFlightStatus flightStatus;
        private JScrollPane flightInfoPane;
-       private JScrollPane sitemapPane;
        private AltosInfoTable flightInfo;
 
        static final int tab_pad = 1;
@@ -131,6 +130,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);
@@ -151,10 +151,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);
                                        }
@@ -191,8 +191,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                pane.add("Table", flightInfoPane);
 
         sitemap = new AltosSiteMap();
-               sitemapPane = new JScrollPane(sitemap);
-        pane.add("Site Map", sitemapPane);
+        pane.add("Site Map", sitemap);
 
                c.gridx = 0;
                c.gridy = 2;