Bump java lib versions in preparation for 1.9.2

[fw/altos] / telegps / TeleGPSStatus.java

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index 1d4415d6064d400444891ea769c3a0643a3ac0ea..d29774bb0973ba5a09cd0046064e54425d43e164 100644 (file)
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.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
@@ -19,8 +20,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -74,11 +75,14 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                String  call;
 
                void show(AltosState state, AltosListenerState listener_state) {
-                       if (state.callsign != call) {
-                               value.setText(state.callsign);
-                               call = state.callsign;
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data == null)
+                               System.out.printf("null cal data?\n");
+                       if (cal_data.callsign != call) {
+                               value.setText(cal_data.callsign);
+                               call = cal_data.callsign;
                        }
-                       if (state.callsign == null)
+                       if (cal_data.callsign == null)
                                setVisible(false);
                        else
                                setVisible(true);
@@ -99,12 +103,13 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        class Serial extends Value {
                int     serial = -1;
                void show(AltosState state, AltosListenerState listener_state) {
-                       if (state.serial != serial) {
-                               if (state.serial == AltosLib.MISSING)
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data.serial != serial) {
+                               if (cal_data.serial == AltosLib.MISSING)
                                        value.setText("none");
                                else
-                                       value.setText(String.format("%d", state.serial));
-                               serial = state.serial;
+                                       value.setText(String.format("%d", cal_data.serial));
+                               serial = cal_data.serial;
                        }
                }
 
@@ -125,12 +130,13 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                int     last_flight = -1;
 
                void show(AltosState state, AltosListenerState listener_state) {
-                       if (state.flight != last_flight) {
-                               if (state.flight == AltosLib.MISSING)
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data.flight != last_flight) {
+                               if (cal_data.flight == AltosLib.MISSING)
                                        value.setText("none");
                                else
-                                       value.setText(String.format("%d", state.flight));
-                               last_flight = state.flight;
+                                       value.setText(String.format("%d", cal_data.flight));
+                               last_flight = cal_data.flight;
                        }
                }
 
@@ -179,11 +185,15 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                long    last_secs = -1;
 
                void show(AltosState state, AltosListenerState listener_state) {
-                       long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
-
-                       if (secs != last_secs) {
-                               value.setText(String.format("%d", secs));
-                               last_secs = secs;
+                       if (listener_state.running) {
+                               long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
+
+                               if (secs != last_secs) {
+                                       value.setText(String.format("%d", secs));
+                                       last_secs = secs;
+                               }
+                       } else {
+                               value.setText("done");
                        }
                }
 
@@ -232,6 +242,8 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                flight.show(state, listener_state);
                rssi.show(state, listener_state);
                last_packet.show(state, listener_state);
+               if (!listener_state.running)
+                       stop();
        }
 
        public int height() {
@@ -239,6 +251,22 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                return d.height;
        }
 
+       TeleGPSStatusUpdate     status_update;
+       javax.swing.Timer       timer;
+
+       public void start(TeleGPSStatusUpdate status_update) {
+               this.status_update = status_update;
+               timer = new javax.swing.Timer(100, status_update);
+               timer.start();
+       }
+
+       public void stop() {
+               if (timer != null) {
+                       timer.stop();
+                       timer = null;
+               }
+       }
+
        public TeleGPSStatus() {
                layout = new GridBagLayout();