Merge remote-tracking branch 'uniarch/master' into multiarch

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 36c08882413fe61b1907d96f654e3769b617a7ab..3e5bcf434fc5b8b8276fe2074873e528d8032d74 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -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,6 +209,13 @@ public class AltosUI extends JFrame {
                        });
                b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
+               b = addButton(3, 2, "Launch Controller");
+               b.addActionListener(new ActionListener() {
+                               public void actionPerformed(ActionEvent e) {
+                                       LaunchController();
+                               }
+                       });
+
                setTitle("AltOS");
 
                pane.doLayout();
@@ -272,6 +278,10 @@ public class AltosUI extends JFrame {
                new AltosSiteMapPreload(AltosUI.this);
        }
 
+       void LaunchController() {
+               new AltosLaunchUI(AltosUI.this);
+       }
+
        /*
         * Replay a flight from telemetry data
         */
@@ -345,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;
                }
        }
@@ -355,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;
                }
        }
@@ -365,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;
                }
        }
@@ -508,6 +518,10 @@ public class AltosUI extends JFrame {
        }
        
        public static void main(final String[] args) {
+               try {
+                       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+               } catch (Exception e) {
+               }
                /* Handle batch-mode */
                if (args.length == 0) {
                        AltosUI altosui = new AltosUI();