projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow for more than one serial port in core AltOS
[fw/altos]
/
altosui
/
AltosScanUI.java
diff --git
a/altosui/AltosScanUI.java
b/altosui/AltosScanUI.java
index dd6672aa29886a41ebea1140dc0eb9d9f8d918b2..e188834e64aa76a204d8026a42324273b800c29a 100644
(file)
--- a/
altosui/AltosScanUI.java
+++ b/
altosui/AltosScanUI.java
@@
-102,7
+102,7
@@
class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
}
public class AltosScanUI
}
public class AltosScanUI
- extends
J
Dialog
+ extends
Altos
Dialog
implements ActionListener
{
AltosUI owner;
implements ActionListener
{
AltosUI owner;
@@
-130,8
+130,7
@@
public class AltosScanUI
void scan_exception(Exception e) {
if (e instanceof FileNotFoundException) {
JOptionPane.showMessageDialog(owner,
void scan_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) {
"Cannot open target device",
JOptionPane.ERROR_MESSAGE);
} else if (e instanceof AltosSerialInUseException) {
@@
-326,8
+325,7
@@
public class AltosScanUI
return true;
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(owner,
return true;
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(owner,
- String.format("Cannot open device \"%s\"",
- device.toShortString()),
+ ee.getMessage(),
"Cannot open target device",
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
"Cannot open target device",
JOptionPane.ERROR_MESSAGE);
} catch (AltosSerialInUseException si) {
@@
-386,7
+384,7
@@
public class AltosScanUI
set_label();
set_label();
- c.fill = GridBagConstraints.
NONE
;
+ c.fill = GridBagConstraints.
HORIZONTAL
;
c.anchor = GridBagConstraints.WEST;
c.insets = i;
c.weightx = 1;
c.anchor = GridBagConstraints.WEST;
c.insets = i;
c.weightx = 1;