altosui: Ship telemini v3.0 firmware

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 009ba4adafb3eab42b2c17cd46c93bff3ab2cb16..cf03d2dc3732562185f8c4ca4c33bbd2c4b18acd 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosVoice              voice;
@@ -40,7 +41,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosDescent    descent;
        AltosLanded     landed;
        AltosCompanionInfo      companion;
-       AltosUIMapNew      sitemap;
+       AltosUIMap      sitemap;
        boolean         has_map;
        boolean         has_companion;
        boolean         has_state;
@@ -53,13 +54,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
        JComponent cur_tab = null;
        JComponent which_tab(AltosState state) {
-               if (state.state < Altos.ao_flight_boost)
+               if (state.state() < Altos.ao_flight_boost)
                        return pad;
-               if (state.state <= Altos.ao_flight_coast)
+               if (state.state() <= Altos.ao_flight_coast)
                        return ascent;
-               if (state.state <= Altos.ao_flight_main)
+               if (state.state() <= Altos.ao_flight_main)
                        return descent;
-               if (state.state == AltosLib.ao_flight_stateless)
+               if (state.state() == AltosLib.ao_flight_stateless)
                        return descent;
                return landed;
        }
@@ -102,7 +103,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                if (state == null)
                        state = new AltosState();
 
-               if (state.state != Altos.ao_flight_startup) {
+               if (state.state() != Altos.ao_flight_startup) {
                        if (!has_state) {
                                pane.setTitleAt(0, "Launch Pad");
                                pane.add(ascent, 1);
@@ -289,7 +290,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                has_companion = false;
                has_state = false;
 
-               sitemap = new AltosUIMapNew();
+               sitemap = new AltosUIMap();
                displays.add(sitemap);
                has_map = false;