lose the map related code

[fw/altos] / teststand / AltosFlightUI.java

diff --git a/teststand/AltosFlightUI.java b/teststand/AltosFlightUI.java
index fa0814daa0a43b71092001a9ef0bbd29e44fa1aa..32f24994d513becdaf3a9ef3909e86e472ed75dc 100644 (file)
--- a/teststand/AltosFlightUI.java
+++ b/teststand/AltosFlightUI.java
@@ -37,12 +37,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
        AltosPad        pad;
        AltosIgnitor    igniter;
-       AltosAscent     ascent;
-       AltosDescent    descent;
        AltosLanded     landed;
        AltosCompanionInfo      companion;
-       AltosUIMap      sitemap;
-       boolean         has_map;
        boolean         has_companion;
        boolean         has_state;
        boolean         has_igniter;
@@ -56,12 +52,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        JComponent which_tab(AltosState state) {
                if (state.state() < Altos.ao_flight_boost)
                        return pad;
-               if (state.state() <= Altos.ao_flight_coast)
-                       return ascent;
-               if (state.state() <= Altos.ao_flight_main)
-                       return descent;
-               if (state.state() == AltosLib.ao_flight_stateless)
-                       return descent;
                return landed;
        }
 
@@ -106,9 +96,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                if (state.state() != Altos.ao_flight_startup) {
                        if (!has_state) {
                                pane.setTitleAt(0, "Launch Pad");
-                               pane.add(ascent, 1);
-                               pane.add(descent, 2);
-                               pane.add(landed, 3);
+                               pane.add(landed, 1);
                                has_state = true;
                        }
                }
@@ -144,18 +132,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                        }
                }
 
-               if (state.gps != null) {
-                       if (!has_map) {
-                               pane.add("Site Map", sitemap);
-                               has_map = true;
-                       }
-               } else {
-                       if (has_map) {
-                               pane.remove(sitemap);
-                               has_map = false;
-                       }
-               }
-
                for (AltosFlightDisplay d : displays) {
                        try {
                                d.show(state, listener_state);
@@ -273,10 +249,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
                igniter = new AltosIgnitor();
                displays.add(igniter);
-               ascent = new AltosAscent();
-               displays.add(ascent);
-               descent = new AltosDescent();
-               displays.add(descent);
                landed = new AltosLanded(reader);
                displays.add(landed);
 
@@ -289,10 +261,6 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                has_companion = false;
                has_state = false;
 
-               sitemap = new AltosUIMap();
-               displays.add(sitemap);
-               has_map = false;
-
                /* Make the tabbed pane use the rest of the window space */
                bag.add(pane, constraints(0, 4, GridBagConstraints.BOTH));