projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools/ao-stmload: Fix ELF, add IHX, add self-flashing
[fw/altos]
/
altosui
/
AltosConfigTD.java
diff --git
a/altosui/AltosConfigTD.java
b/altosui/AltosConfigTD.java
index 71d628b310c731a69eb8f25f88fdc3140efed2df..16c9e357134c58ded5f2a8e545c3f902781669ac 100644
(file)
--- a/
altosui/AltosConfigTD.java
+++ b/
altosui/AltosConfigTD.java
@@
-17,20
+17,12
@@
package altosui;
package altosui;
-import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-
-import libaltosJNI.*;
-
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosConfigTD implements ActionListener {
public class AltosConfigTD implements ActionListener {
@@
-323,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);
@@
-345,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);
}
}
}
}
}
}