X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=73da9933501a0707d470f62c7acd1c261ce1c9a9;hp=9a8c8087037ba4ff604d400b36f3ad64c8862c1d;hb=2e82051a6aaaccf1e8a242f9c8141e4167e652d2;hpb=60f4d69592c440ab7bb67a04f4c07fc7279d2c20

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 9a8c8087..73da9933 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.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
@@ -18,8 +19,8 @@
 package altosui;
 
 import java.util.*;
-import org.altusmetrum.altoslib_10.*;
-import org.altusmetrum.altosuilib_10.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosPad extends AltosUIFlightTab {
 
@@ -45,10 +46,10 @@ public class AltosPad extends AltosUIFlightTab {
 
 	class LoggingReady extends AltosUIIndicator {
 		public void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.flight == AltosLib.MISSING) {
+			if (state == null || state.cal_data.flight == AltosLib.MISSING) {
 				hide();
 			} else {
-				if (state.flight != 0) {
+				if (state.cal_data.flight != 0) {
 					if (state.state() <= Altos.ao_flight_pad)
 						show("Ready to record");
 					else if (state.state() < Altos.ao_flight_landed ||
@@ -58,7 +59,7 @@ public class AltosPad extends AltosUIFlightTab {
 						show("Recorded data");
 				} else
 					show("Storage full");
-				set_lights(state.flight != 0);
+				set_lights(state.cal_data.flight != 0);
 			}
 		}
 		public LoggingReady (AltosUIFlightTab container, int y) {