altosui: Deal with serial port exceptions a bit better

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 8399b7c8440e101a1d271c5c00ed4542fe0b6786..8799d560767a6d8f532bdc47914e6b228f498121 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosUI extends JFrame {
+public class AltosUI extends AltosFrame {
        public AltosVoice voice = new AltosVoice();
 
        public static boolean load_library(Frame frame) {
@@ -52,8 +52,7 @@ public class AltosUI extends JFrame {
                                new AltosFlightUI(voice, reader, device.getSerial());
                } catch (FileNotFoundException ee) {
                        JOptionPane.showMessageDialog(AltosUI.this,
-                                                     String.format("Cannot open device \"%s\"",
-                                                                   device.toShortString()),
+                                                     ee.getMessage(),
                                                      "Cannot open target device",
                                                      JOptionPane.ERROR_MESSAGE);
                } catch (AltosSerialInUseException si) {
@@ -210,7 +209,7 @@ public class AltosUI extends JFrame {
                        });
                b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
-               b = addButton(2, 2, "Launch Controller");
+               b = addButton(3, 2, "Launch Controller");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        LaunchController();
@@ -356,7 +355,7 @@ public class AltosUI extends JFrame {
                        else
                                return new AltosTelemetryIterable(in);
                } catch (FileNotFoundException fe) {
-                       System.out.printf("Cannot open '%s'\n", filename);
+                       System.out.printf("%s\n", fe.getMessage());
                        return null;
                }
        }
@@ -366,7 +365,7 @@ public class AltosUI extends JFrame {
                try {
                        return new AltosCSV(file);
                } catch (FileNotFoundException fe) {
-                       System.out.printf("Cannot open '%s'\n", filename);
+                       System.out.printf("%s\n", fe.getMessage());
                        return null;
                }
        }
@@ -376,7 +375,7 @@ public class AltosUI extends JFrame {
                try {
                        return new AltosKML(file);
                } catch (FileNotFoundException fe) {
-                       System.out.printf("Cannot open '%s'\n", filename);
+                       System.out.printf("%s\n", fe.getMessage());
                        return null;
                }
        }
@@ -520,7 +519,7 @@ public class AltosUI extends JFrame {
        
        public static void main(final String[] args) {
                try {
-                       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                       UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
                } catch (Exception e) {
                }
                /* Handle batch-mode */