java: Bump java library versions for next release

[fw/altos] / telegps / TeleGPSStatus.java

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index e6bb1ea58a7bb047836aa99857f41fca895aa738..1d4415d6064d400444891ea769c3a0643a3ac0ea 100644 (file)
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -19,8 +19,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -83,6 +83,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                        else
                                setVisible(true);
                }
+
+               public void reset() {
+                       super.reset();
+                       call = "";
+               }
+
                public Call (GridBagLayout layout, int x) {
                        super (layout, x, "Callsign");
                }
@@ -101,6 +107,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                                serial = state.serial;
                        }
                }
+
+               public void reset() {
+                       super.reset();
+                       serial = -1;
+               }
+
                public Serial (GridBagLayout layout, int x) {
                        super (layout, x, "Serial");
                }
@@ -108,6 +120,32 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        Serial serial;
 
+       class Flight extends Value {
+
+               int     last_flight = -1;
+
+               void show(AltosState state, AltosListenerState listener_state) {
+                       if (state.flight != last_flight) {
+                               if (state.flight == AltosLib.MISSING)
+                                       value.setText("none");
+                               else
+                                       value.setText(String.format("%d", state.flight));
+                               last_flight = state.flight;
+                       }
+               }
+
+               public void reset() {
+                       super.reset();
+                       last_flight = -1;
+               }
+
+               public Flight (GridBagLayout layout, int x) {
+                       super (layout, x, "Flight");
+               }
+       }
+
+       Flight flight;
+
        class RSSI extends Value {
                int     rssi = 10000;
 
@@ -123,6 +161,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                                rssi = new_rssi;
                        }
                }
+
+               public void reset() {
+                       super.reset();
+                       rssi = 10000;
+               }
+
                public RSSI (GridBagLayout layout, int x) {
                        super (layout, x, "RSSI");
                }
@@ -142,6 +186,16 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                                last_secs = secs;
                        }
                }
+
+               void reset() {
+                       super.reset();
+                       last_secs = -1;
+               }
+
+               void disable() {
+                       value.setText("");
+               }
+
                public LastPacket(GridBagLayout layout, int x) {
                        super (layout, x, "Age");
                }
@@ -149,9 +203,14 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        LastPacket last_packet;
 
+       public void disable_receive() {
+               last_packet.disable();
+       }
+
        public void reset () {
                call.reset();
                serial.reset();
+               flight.reset();
                rssi.reset();
                last_packet.reset();
        }
@@ -159,6 +218,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        public void font_size_changed(int font_size) {
                call.set_font();
                serial.set_font();
+               flight.set_font();
                rssi.set_font();
                last_packet.set_font();
        }
@@ -169,6 +229,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        public void show (AltosState state, AltosListenerState listener_state) {
                call.show(state, listener_state);
                serial.show(state, listener_state);
+               flight.show(state, listener_state);
                rssi.show(state, listener_state);
                last_packet.show(state, listener_state);
        }
@@ -185,6 +246,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
                call = new Call(layout, 0);
                serial = new Serial(layout, 1);
+               flight = new Flight(layout, 2);
                rssi = new RSSI(layout, 4);
                last_packet = new LastPacket(layout, 5);
        }