X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIgnitor.java;h=7c7d1fba2cac14c925f018494f7d3bd638f74b9a;hp=deb96a5e36b510d17230bc1a142d27f2cf480f33;hb=78a90fc760b88ab66c5c238289afc38356e29d8a;hpb=cb23b992be8ba40c97d8988c134a814a13ccd58c

diff --git a/altosui/AltosIgnitor.java b/altosui/AltosIgnitor.java
index deb96a5e..7c7d1fba 100644
--- a/altosui/AltosIgnitor.java
+++ b/altosui/AltosIgnitor.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
@@ -20,65 +21,65 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_7.*;
-import org.altusmetrum.altosuilib_7.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosIgnitor extends AltosUIFlightTab {
 
 	public class Ignitor extends AltosUIUnitsIndicator {
-		int		ignitor;
+		int		igniter;
 
 		public double value(AltosState state, int i) {
-			if (state.ignitor_voltage == null ||
-			    state.ignitor_voltage.length < ignitor)
+			if (state.igniter_voltage == null ||
+			    state.igniter_voltage.length < igniter)
 				return AltosLib.MISSING;
-			return state.ignitor_voltage[ignitor];
+			return state.igniter_voltage[igniter];
 		}
 
 		public double good() { return AltosLib.ao_igniter_good; }
 
 		public Ignitor (AltosUIFlightTab container, int y) {
-			super(container, y, AltosConvert.voltage, String.format ("%s Voltage", AltosLib.ignitor_name(y)), 1, true, 1);
-			ignitor = y;
+			super(container, y, AltosConvert.voltage, String.format ("%s Voltage", AltosLib.igniter_name(y)), 1, true, 1);
+			igniter = y;
 		}
 	}
 
-	Ignitor[] ignitors;
+	Ignitor[] igniters;
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 		if (isShowing())
-			make_ignitors(state);
+			make_igniters(state);
 		super.show(state, listener_state);
 	}
 
 	public boolean should_show(AltosState state) {
 		if (state == null)
 			return false;
-		if (state.ignitor_voltage == null)
+		if (state.igniter_voltage == null)
 			return false;
-		return state.ignitor_voltage.length > 0;
+		return state.igniter_voltage.length > 0;
 	}
 
-	void make_ignitors(AltosState state) {
-		int n = (state == null || state.ignitor_voltage == null) ? 0 : state.ignitor_voltage.length;
-		int old_n = ignitors == null ? 0 : ignitors.length;
+	void make_igniters(AltosState state) {
+		int n = (state == null || state.igniter_voltage == null) ? 0 : state.igniter_voltage.length;
+		int old_n = igniters == null ? 0 : igniters.length;
 
 		if (n != old_n) {
 
-			if (ignitors != null) {
-				for (int i = 0; i < ignitors.length; i++) {
-					remove(ignitors[i]);
-					ignitors[i].remove(this);
-					ignitors = null;
+			if (igniters != null) {
+				for (int i = 0; i < igniters.length; i++) {
+					remove(igniters[i]);
+					igniters[i].remove(this);
+					igniters = null;
 				}
 			}
 
 			if (n > 0) {
 				setVisible(true);
-				ignitors = new Ignitor[n];
+				igniters = new Ignitor[n];
 				for (int i = 0; i < n; i++) {
-					ignitors[i] = new Ignitor(this, i);
-					add(ignitors[i]);
+					igniters[i] = new Ignitor(this, i);
+					add(igniters[i]);
 				}
 			} else
 				setVisible(false);