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

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 24d25bd7c46a0a4683fc732ce4441711a48a3fed..7fcfb8be6da68d5f356dd723ea146cf195089127 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -47,23 +47,17 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
 

-       static final int tab_pad = 1;
-       static final int tab_ascent = 2;
-       static final int tab_descent = 3;
-       static final int tab_landed = 4;
-
-       int cur_tab = 0;
-

        boolean exit_on_close = false;
 
        boolean exit_on_close = false;
 

-       int which_tab(AltosState state) {
+       JComponent cur_tab = null;
+       JComponent which_tab(AltosState state) {

                if (state.state < Altos.ao_flight_boost)
                if (state.state < Altos.ao_flight_boost)

-                       return tab_pad;
+                       return pad;

                if (state.state <= Altos.ao_flight_coast)
                if (state.state <= Altos.ao_flight_coast)

-                       return tab_ascent;
+                       return ascent;

                if (state.state <= Altos.ao_flight_main)
                if (state.state <= Altos.ao_flight_main)

-                       return tab_descent;
-               return tab_landed;
+                       return descent;
+               return landed;

        }
 
        void stop_display() {
        }
 
        void stop_display() {


@@ -90,24 +84,14 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        }
 
        public void show(AltosState state, int crc_errors) {
        }
 
        public void show(AltosState state, int crc_errors) {

-               int     tab = which_tab(state);
+               JComponent tab = which_tab(state);

                pad.show(state, crc_errors);
                ascent.show(state, crc_errors);
                descent.show(state, crc_errors);
                landed.show(state, crc_errors);
                if (tab != cur_tab) {
                pad.show(state, crc_errors);
                ascent.show(state, crc_errors);
                descent.show(state, crc_errors);
                landed.show(state, crc_errors);
                if (tab != cur_tab) {

-                       switch (tab) {
-                       case tab_pad:
-                               pane.setSelectedComponent(pad);
-                               break;
-                       case tab_ascent:
-                               pane.setSelectedComponent(ascent);
-                               break;
-                       case tab_descent:
-                               pane.setSelectedComponent(descent);
-                               break;
-                       case tab_landed:
-                               pane.setSelectedComponent(landed);
+                       if (cur_tab == pane.getSelectedComponent()) {
+                               pane.setSelectedComponent(tab);

                        }
                        cur_tab = tab;
                }
                        }
                        cur_tab = tab;
                }