Merge remote-tracking branch 'mjb/altosui_mjb'

[fw/altos] / altosui / AltosLaunchUI.java

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 47365e03bd46a19bc933553d55beac501e3effd9..39b986c0a129f0dde62a7533be54027bd9bb3ea9 100644 (file)
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -20,13 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
 import java.io.*;
-import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
 
 class FireButton extends JButton {
@@ -50,7 +45,7 @@ class FireButton extends JButton {
 }
 
 public class AltosLaunchUI
-       extends JDialog
+       extends AltosDialog
        implements ActionListener
 {
        AltosDevice     device;
@@ -316,7 +311,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 +321,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));
@@ -335,7 +330,6 @@ public class AltosLaunchUI
 
        public void actionPerformed(ActionEvent e) {
                String cmd = e.getActionCommand();
-               System.out.printf("cmd %s\n", cmd);
                if (cmd.equals("armed") || cmd.equals("igniter")) {
                        stop_arm_timer();
                }
@@ -388,8 +382,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;