projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another try at skipping broken avr-gcc
[fw/altos]
/
altosui
/
AltosConfigTD.java
diff --git
a/altosui/AltosConfigTD.java
b/altosui/AltosConfigTD.java
index fcf1efb1c619d62e3b7f39a3e79d655d3d014d9a..f879ff88bcdef1324db4714e8e16a7a0c9487cd1 100644
(file)
--- a/
altosui/AltosConfigTD.java
+++ b/
altosui/AltosConfigTD.java
@@
-21,8
+21,8
@@
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
-
-import org.altusmetrum.
AltosLib
.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.
altosuilib_1
.*;
public class AltosConfigTD implements ActionListener {
public class AltosConfigTD implements ActionListener {
@@
-315,7
+315,7
@@
public class AltosConfigTD implements ActionListener {
version = new string_ref("unknown");
product = new string_ref("unknown");
version = new string_ref("unknown");
product = new string_ref("unknown");
- device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+ device = AltosDevice
UI
Dialog.show(owner, Altos.product_basestation);
if (device != null) {
try {
serial_line = new AltosSerial(device);
if (device != null) {
try {
serial_line = new AltosSerial(device);
@@
-337,11
+337,6
@@
public class AltosConfigTD implements ActionListener {
device.toShortString()),
"Device in use",
JOptionPane.ERROR_MESSAGE);
device.toShortString()),
"Device in use",
JOptionPane.ERROR_MESSAGE);
- } catch (IOException ee) {
- JOptionPane.showMessageDialog(owner,
- device.toShortString(),
- ee.getLocalizedMessage(),
- JOptionPane.ERROR_MESSAGE);
}
}
}
}
}
}