Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 9b4a18bce172b8a58c62b4d78e944148e4dd2760..8742b8ca33210b8983c2d5504b2266a472d8e58d 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_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosVoice              voice;
@@ -35,16 +36,16 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        JTabbedPane     pane;
 
        AltosPad        pad;
-       AltosIgnitor    ignitor;
+       AltosIgnitor    igniter;
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
        AltosCompanionInfo      companion;
-       AltosUIMapNew      sitemap;
+       AltosUIMap      sitemap;
        boolean         has_map;
        boolean         has_companion;
        boolean         has_state;
-       boolean         has_ignitor;
+       boolean         has_igniter;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
@@ -100,7 +101,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                status_update.saved_listener_state = listener_state;
 
                if (state == null)
-                       state = new AltosState();
+                       state = new AltosState(new AltosCalData());
 
                if (state.state() != Altos.ao_flight_startup) {
                        if (!has_state) {
@@ -114,21 +115,20 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
 
                JComponent tab = which_tab(state);
                if (tab != cur_tab) {
-                       if (cur_tab == pane.getSelectedComponent()) {
+                       if (cur_tab == pane.getSelectedComponent())
                                pane.setSelectedComponent(tab);
-                       }
                        cur_tab = tab;
                }
 
-               if (ignitor.should_show(state)) {
-                       if (!has_ignitor) {
-                               pane.add("Ignitor", ignitor);
-                               has_ignitor = true;
+               if (igniter.should_show(state)) {
+                       if (!has_igniter) {
+                               pane.add("Ignitor", igniter);
+                               has_igniter = true;
                        }
                } else {
-                       if (has_ignitor) {
-                               pane.remove(ignitor);
-                               has_ignitor = false;
+                       if (has_igniter) {
+                               pane.remove(igniter);
+                               has_igniter = false;
                        }
                }
 
@@ -144,7 +144,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                        }
                }
 
-               if (state.gps != null && state.gps.connected) {
+               if (state.gps != null) {
                        if (!has_map) {
                                pane.add("Site Map", sitemap);
                                has_map = true;
@@ -271,8 +271,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
                displays.add(pad);
                pane.add("Status", pad);
 
-               ignitor = new AltosIgnitor();
-               displays.add(ignitor);
+               igniter = new AltosIgnitor();
+               displays.add(igniter);
                ascent = new AltosAscent();
                displays.add(ascent);
                descent = new AltosDescent();
@@ -289,7 +289,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;