Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox

Conflicts:
	ao-tools/altosui/AltosFlightUI.java

diff --cc ao-tools/altosui/AltosFlightUI.java
index f56b3d1bd4cf200a79e6e8736fc1234ceaf486c9,78b005c0908656158496e3fe0f235c0c82651a1f..1372cc00d8da9368ded43ae3bb15c771d0862b71
--- 1/ao-tools/altosui/AltosFlightUI.java
--- 2/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@@ -44,9 -44,9 +44,10 @@@ public class AltosFlightUI extends JFra
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
 +    AltosSiteMap    sitemap;
  
-       private AltosStatusTable flightStatus;
+       private AltosFlightStatus flightStatus;
+       private JScrollPane flightInfoPane;
        private AltosInfoTable flightInfo;
  
        static final int tab_pad = 1;
@@@ -119,13 -120,16 +122,17 @@@
                        }
                        cur_tab = tab;
                }
-               flightStatus.set(state);
+               flightStatus.show(state, crc_errors);
                flightInfo.show(state, crc_errors);
 +              sitemap.show(state, crc_errors);
        }
  
+       public void set_exit_on_close() {
+               exit_on_close = true;
+       }
+ 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-         AltosPreferences.init(this);
+               AltosPreferences.init(this);
  
                voice = in_voice;
                reader = in_reader;
@@@ -156,11 -160,9 +163,12 @@@
                pane.add("Landed", landed);
  
                flightInfo = new AltosInfoTable();
-               pane.add("Table", new JScrollPane(flightInfo.box()));
+               flightInfoPane = new JScrollPane(flightInfo.box());
+               pane.add("Table", flightInfoPane);
  
 +        sitemap = new AltosSiteMap();
 +        pane.add("Site Map", sitemap);
 +
                vbox.add(pane);
  
                this.add(vbox);

diff --cc ao-tools/altosui/AltosInfoTable.java
Simple merge

diff --cc ao-tools/altosui/Makefile.am
index fc532863008aaec0297aa182149b7d6b756ea6f5,8d0fe16eca2ec78e32f57e5b5b3b0806c7b6ac39..1c24ce13396fe0d2e58da7b616188763b78461a7
--- 1/ao-tools/altosui/Makefile.am
--- 2/ao-tools/altosui/Makefile.am
+++ b/ao-tools/altosui/Makefile.am
@@@ -58,10 -59,9 +59,10 @@@ altosui_JAVA = 
        AltosRomconfig.java \
        AltosRomconfigUI.java \
        AltosSerial.java \
+       AltosSerialInUseException.java \
        AltosSerialMonitor.java \
 +      AltosSiteMap.java \
        AltosState.java \
-       AltosStatusTable.java \
        AltosTelemetry.java \
        AltosTelemetryIterable.java \
        AltosUI.java \