Merge branch 'buttonbox' into sitemap

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

diff --cc ao-tools/altosui/AltosFlightUI.java
index c85fc9776259a150d5eabd8f1ed4ea46de08bb7e,d5bcdb104d8f63a00224259155fe6fc67cf8a046..1107d52725a62125d46c1c1940d73f908747d69a
--- 1/ao-tools/altosui/AltosFlightUI.java
--- 2/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -42,10 -42,8 +42,9 @@@ public class AltosFlightUI extends JFra
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
-     AltosSiteMap    sitemap;
++      AltosSiteMap    sitemap;
  
        private AltosFlightStatus flightStatus;
-       private JScrollPane flightInfoPane;
        private AltosInfoTable flightInfo;
  
        static final int tab_pad = 1;
@@@ -153,12 -142,12 +145,12 @@@
                        // Channel menu
                        channels = new AltosChannelMenu(AltosPreferences.channel(serial));
                        channels.addActionListener(new ActionListener() {
--                                      public void actionPerformed(ActionEvent e) {
--                                              int channel = channels.getSelectedIndex();
--                                              reader.set_channel(channel);
--                                              AltosPreferences.set_channel(serial, channel);
--                                      }
--                              });
++                              public void actionPerformed(ActionEvent e) {
++                                      int channel = channels.getSelectedIndex();
++                                      reader.set_channel(channel);
++                                      AltosPreferences.set_channel(serial, channel);
++                              }
++                      });
                        c.gridx = 0;
                        c.gridy = 0;
                        c.anchor = GridBagConstraints.WEST;
@@@ -187,12 -180,9 +183,12 @@@
                pane.add("Landed", landed);
  
                flightInfo = new AltosInfoTable();
-               flightInfoPane = new JScrollPane(flightInfo.box());
-               pane.add("Table", flightInfoPane);
+               pane.add("Table", new JScrollPane(flightInfo));
  
-         sitemap = new AltosSiteMap();
-         pane.add("Site Map", sitemap);
++              sitemap = new AltosSiteMap();
++              pane.add("Site Map", sitemap);
 +
+               /* Make the tabbed pane use the rest of the window space */
                c.gridx = 0;
                c.gridy = 2;
                c.fill = GridBagConstraints.BOTH;

diff --cc ao-tools/altosui/AltosInfoTable.java
index 9f2bef5be6e3712230291fc43e6b4f15313e210d,c571d5c901be7a2d32ad99d01847f25aa3d99ce2..723f830169f6722298a593cf6ce8f8972bae850b
--- 1/ao-tools/altosui/AltosInfoTable.java
--- 2/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@@ -28,14 -28,11 +28,11 @@@ import java.text.*
  import java.util.prefs.*;
  import java.util.concurrent.LinkedBlockingQueue;
  
- public class AltosInfoTable {
-       private Box                       box;
-       private JTable                    table[];
-       private AltosFlightInfoTableModel model[];
-       private Box                       ibox[];
+ public class AltosInfoTable extends JTable {
+       private AltosFlightInfoTableModel model;
  
 -      private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 12);
 -      private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 12);
 +      private Font infoLabelFont = new Font("SansSerif", Font.PLAIN, 14);
 +      private Font infoValueFont = new Font("Monospaced", Font.PLAIN, 14);
  
        static final int info_columns = 3;
        static final int info_rows = 17;