Reverted package name to 'altosui' from 'AltosUI'

[fw/altos] / altosui / AltosLaunchUI.java

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 4e630afb11045477fff135c42d32f19bc16f51c0..444815442de739d5a40b45f909599df9d07c8a82 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;
@@ -164,8 +165,7 @@ public class AltosLaunchUI
        void launch_exception(Exception e) {
                if (e instanceof FileNotFoundException) {
                        JOptionPane.showMessageDialog(owner,
-                                                     String.format("Cannot open device \"%s\"",
-                                                                   device.toShortString()),
+                                                     ((FileNotFoundException) e).getMessage(),
                                                      "Cannot open target device",
                                                      JOptionPane.ERROR_MESSAGE);
                } else if (e instanceof AltosSerialInUseException) {
@@ -317,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));
@@ -327,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));
@@ -336,7 +336,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();
                }
@@ -389,8 +388,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;