altosui: Deal with serial port exceptions a bit better

[fw/altos] / altosui / AltosIgniteUI.java

diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 806b87b9d4e9fcdb60d7eb27a1d4e6c508461b52..8623cbef3ace51a255f36899b68951727f867d45 100644 (file)
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -30,7 +30,7 @@ import java.util.prefs.*;
 import java.util.concurrent.*;
 
 public class AltosIgniteUI
-       extends JDialog
+       extends AltosDialog
        implements ActionListener
 {
        AltosDevice     device;
@@ -122,8 +122,7 @@ public class AltosIgniteUI
        void ignite_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) {
@@ -341,8 +340,8 @@ public class AltosIgniteUI
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.CENTER;
                c.insets = i;
-               c.weightx = 1;
-               c.weighty = 1;
+               c.weightx = 0;
+               c.weighty = 0;
 
                c.gridx = 0;
                c.gridy = 0;
@@ -412,7 +411,6 @@ public class AltosIgniteUI
                close.addActionListener(this);
                close.setActionCommand("close");
                        
-
                pack();
                setLocationRelativeTo(owner);