altosui: Complete split out of separate java library

[fw/altos] / altosui / AltosLaunchUI.java

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 47365e03bd46a19bc933553d55beac501e3effd9..eb76243db8784b1d0a5cd4f91eab10d9ca3caf76 100644 (file)
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -28,6 +28,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class FireButton extends JButton {
        protected void processMouseEvent(MouseEvent e) {
@@ -50,7 +51,7 @@ class FireButton extends JButton {
 }
 
 public class AltosLaunchUI
-       extends JDialog
+       extends AltosDialog
        implements ActionListener
 {
        AltosDevice     device;
@@ -316,7 +317,7 @@ public class AltosLaunchUI
        void set_serial() {
                try {
                        launcher_serial = Integer.parseInt(launcher_serial_text.getText());
-                       AltosPreferences.set_launcher_serial(launcher_serial);
+                       AltosUIPreferences.set_launcher_serial(launcher_serial);
                        send_command("set_remote");
                } catch (NumberFormatException ne) {
                        launcher_serial_text.setText(String.format("%d", launcher_serial));
@@ -326,7 +327,7 @@ public class AltosLaunchUI
        void set_channel() {
                try {
                        launcher_channel = Integer.parseInt(launcher_channel_text.getText());
-                       AltosPreferences.set_launcher_serial(launcher_channel);
+                       AltosUIPreferences.set_launcher_serial(launcher_channel);
                        send_command("set_remote");
                } catch (NumberFormatException ne) {
                        launcher_channel_text.setText(String.format("%d", launcher_channel));
@@ -388,8 +389,8 @@ public class AltosLaunchUI
 
        public AltosLaunchUI(JFrame in_owner) {
 
-               launcher_channel = AltosPreferences.launcher_channel();
-               launcher_serial = AltosPreferences.launcher_serial();
+               launcher_channel = AltosUIPreferences.launcher_channel();
+               launcher_serial = AltosUIPreferences.launcher_serial();
                owner = in_owner;
                armed_status = AltosLaunch.Unknown;
                igniter_status = AltosLaunch.Unknown;