projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Change button to 'Configure Altimeter'
[fw/altos]
/
altosui
/
AltosEepromManage.java
diff --git
a/altosui/AltosEepromManage.java
b/altosui/AltosEepromManage.java
index 5fb70a8413cba0e1e5b9be39f4421b46cc3467a8..cd2b74fef448d6816ac25e23f5208ffa2367eb76 100644
(file)
--- a/
altosui/AltosEepromManage.java
+++ b/
altosui/AltosEepromManage.java
@@
-168,17
+168,23
@@
public class AltosEepromManage implements ActionListener {
AltosEepromManage manage;
public void run () {
AltosEepromManage manage;
public void run () {
+ Runnable r;
try {
flights = new AltosEepromList(serial_line, remote);
try {
flights = new AltosEepromList(serial_line, remote);
-
Runnable
r = new Runnable() {
+ r = new Runnable() {
public void run() {
public void run() {
-
manage.
got_flights(flights);
+ got_flights(flights);
}
};
}
};
- SwingUtilities.invokeLater(r);
} catch (Exception e) {
} catch (Exception e) {
- manage.got_exception(e);
+ final Exception f_e = e;
+ r = new Runnable() {
+ public void run() {
+ got_exception(f_e);
+ }
+ };
}
}
+ SwingUtilities.invokeLater(r);
}
public EepromGetList(AltosEepromManage in_manage) {
}
public EepromGetList(AltosEepromManage in_manage) {
@@
-191,7
+197,7
@@
public class AltosEepromManage implements ActionListener {
boolean running = false;
frame = given_frame;
boolean running = false;
frame = given_frame;
- device = AltosDeviceDialog.show(frame, Altos
Device
.product_any);
+ device = AltosDeviceDialog.show(frame, Altos.product_any);
remote = false;
any_download = false;
remote = false;
any_download = false;
@@
-200,7
+206,7
@@
public class AltosEepromManage implements ActionListener {
if (device != null) {
try {
serial_line = new AltosSerial(device);
if (device != null) {
try {
serial_line = new AltosSerial(device);
- if (!device.matchProduct(Altos
Device
.product_telemetrum))
+ if (!device.matchProduct(Altos.product_telemetrum))
remote = true;
serial_line.set_frame(frame);
remote = true;
serial_line.set_frame(frame);