X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=cf03d2dc3732562185f8c4ca4c33bbd2c4b18acd;hp=009ba4adafb3eab42b2c17cd46c93bff3ab2cb16;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=1098f7502a603a9cf80ad950f53a2c2abdf7ec93

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 009ba4ad..cf03d2dc 100644
--- 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;