Switch from GPLv2 to GPLv2+

[fw/altos] / altosui / AltosFlightStatusUpdate.java

diff --git a/altosui/AltosFlightStatusUpdate.java b/altosui/AltosFlightStatusUpdate.java
index a600bd0263a7f394d680f7168f0cf5bf58f47ce4..82ef43c2c8428052d30a987ce4ea47a6907b1e7b 100644 (file)
--- a/altosui/AltosFlightStatusUpdate.java
+++ b/altosui/AltosFlightStatusUpdate.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
@@ -17,25 +18,21 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosFlightStatusUpdate implements ActionListener {
 
-       public AltosState       saved_state;
-       AltosFlightStatus       flightStatus;
+       public AltosState               saved_state;
+       public AltosListenerState       saved_listener_state;
+       AltosFlightStatus               flightStatus;
 
        public void actionPerformed (ActionEvent e) {
-               if (saved_state != null)
-                       flightStatus.show(saved_state, 0);
+               if (saved_state != null) {
+                       if (saved_listener_state == null)
+                               saved_listener_state = new AltosListenerState();
+                       flightStatus.show(saved_state, saved_listener_state);
+               }
        }
 
        public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {