altosui/altosuilib: Cleanup -Xlint:unchecked warnings

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index c151177e73e1915fae355b66fc9939ff33507b56..b31de12c858ee6cf0f6c3a5ec10ce8051ef77bfc 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,7 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
 import org.altusmetrum.altosuilib_1.*;
 
 public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
@@ -32,6 +32,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
        JTabbedPane     pane;
 
        AltosPad        pad;
+       AltosIgnitor    ignitor;
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
@@ -40,6 +41,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
        boolean         has_map;
        boolean         has_companion;
        boolean         has_state;
+       boolean         has_ignitor;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
@@ -73,6 +75,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
        public void reset() {
                pad.reset();
+               ignitor.reset();
                ascent.reset();
                descent.reset();
                landed.reset();
@@ -82,6 +85,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
        public void set_font() {
                pad.set_font();
+               ignitor.set_font();
                ascent.set_font();
                descent.set_font();
                landed.set_font();
@@ -130,6 +134,19 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
                flightStatus.show(state, listener_state);
                flightInfo.show(state, listener_state);
 
+               if (ignitor.should_show(state)) {
+                       if (!has_ignitor) {
+                               pane.add("Ignitor", ignitor);
+                               has_ignitor = true;
+                       }
+                       ignitor.show(state, listener_state);
+               } else {
+                       if (has_ignitor) {
+                               pane.remove(ignitor);
+                               has_ignitor = false;
+                       }
+               }
+
                if (state.companion != null) {
                        if (!has_companion) {
                                pane.add("Companion", companion);
@@ -162,7 +179,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
        Container       bag;
        AltosFreqList   frequencies;
-       JComboBox       telemetries;
+       JComboBox<String>       telemetries;
        JLabel          telemetry;
 
        ActionListener  show_timer;
@@ -208,8 +225,8 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
 
                        // Telemetry format menu
                        if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-                               telemetries = new JComboBox();
-                               for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+                               telemetries = new JComboBox<String>();
+                               for (int i = 1; i <= Altos.ao_telemetry_max; i++)
                                        telemetries.addItem(Altos.telemetry_name(i));
                                int telemetry = AltosPreferences.telemetry(serial);
                                if (telemetry <= Altos.ao_telemetry_off ||
@@ -274,6 +291,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
                pad = new AltosPad();
                pane.add("Status", pad);
 
+               ignitor = new AltosIgnitor();
                ascent = new AltosAscent();
                descent = new AltosDescent();
                landed = new AltosLanded(reader);