Add altoslib/.gitignore

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index d166c9aefbb30147d06118f0e11a55487903e2c5..c2363094c6c1895456c4a7bf4278fe2196105184 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;
@@ -152,7 +153,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        JComboBox       telemetries;
 
        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;
@@ -171,7 +172,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() {
@@ -198,7 +199,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                        telemetries = new JComboBox();
                        for (int i = 1; i <= Altos.ao_telemetry_max; i++)
                                telemetries.addItem(Altos.telemetry_name(i));
-                       int telemetry = AltosPreferences.telemetry(serial);
+                       int telemetry = AltosUIPreferences.telemetry(serial);
                        if (telemetry <= Altos.ao_telemetry_off ||
                            telemetry > Altos.ao_telemetry_max)
                                telemetry = Altos.ao_telemetry_standard;
@@ -270,7 +271,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
@@ -278,7 +279,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);
                                }