Reverted package name to 'altosui' from 'AltosUI'

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index d99da43dea0622b4f50bbd53ddbabeeb647bea9d..ddc54cbd18a82958b4cefc1bd809a43cc7b80c1e 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -27,21 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
-
-class AltosFlightStatusUpdate implements ActionListener {
-
-       public AltosState       saved_state;
-       AltosFlightStatus       flightStatus;
-
-       public void actionPerformed (ActionEvent e) {
-               if (saved_state != null)
-                       flightStatus.show(saved_state, 0);
-       }
-
-       public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {
-               flightStatus = in_flightStatus;
-       }
-}
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;
@@ -174,7 +160,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        ActionListener  show_timer;
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
 
                voice = in_voice;
                reader = in_reader;
@@ -193,7 +179,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                /* Stick channel selector at top of table for telemetry monitoring */
                if (serial >= 0) {
                        // Channel menu
-                       frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+                       frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
                        frequencies.set_product("Monitor");
                        frequencies.set_serial(serial);
                        frequencies.addActionListener(new ActionListener() {
@@ -313,7 +299,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-               AltosPreferences.register_font_listener(this);
+               AltosUIPreferences.register_font_listener(this);
 
                addWindowListener(new WindowAdapter() {
                                @Override
@@ -321,7 +307,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                                        disconnect();
                                        setVisible(false);
                                        dispose();
-                                       AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+                                       AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
                                        if (exit_on_close)
                                                System.exit(0);
                                }