projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Record whether flight data includes sensor values in AltosFlightStats
[fw/altos]
/
altosui
/
AltosConfig.java
diff --git
a/altosui/AltosConfig.java
b/altosui/AltosConfig.java
index e1ffebb4b95f1129144e1a86c70dadf2915ae78d..2cf69525fea1e468d5ab40a502b224d9c64530bd 100644
(file)
--- a/
altosui/AltosConfig.java
+++ b/
altosui/AltosConfig.java
@@
-21,8
+21,9
@@
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 java.text.*;
import java.text.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
public class AltosConfig implements ActionListener {
public class AltosConfig implements ActionListener {
@@
-160,9
+161,9
@@
public class AltosConfig implements ActionListener {
} finally {
try {
stop_serial();
} finally {
try {
stop_serial();
+ serial_line.close();
} catch (InterruptedException ie) {
}
} catch (InterruptedException ie) {
}
- serial_line.close();
}
}
}
}
@@
-241,9
+242,15
@@
public class AltosConfig implements ActionListener {
/* Pull data out of the UI and stuff back into our local data record */
/* Pull data out of the UI and stuff back into our local data record */
- data.get_values(config_ui);
-
- run_serial_thread(serial_mode_save);
+ try {
+ data.get_values(config_ui);
+ run_serial_thread(serial_mode_save);
+ } catch (AltosConfigDataException ae) {
+ JOptionPane.showMessageDialog(owner,
+ ae.getMessage(),
+ "Configuration Data Error",
+ JOptionPane.ERROR_MESSAGE);
+ }
}
public void actionPerformed(ActionEvent e) {
}
public void actionPerformed(ActionEvent e) {
@@
-270,7
+277,7
@@
public class AltosConfig implements ActionListener {
public AltosConfig(JFrame given_owner) {
owner = given_owner;
public AltosConfig(JFrame given_owner) {
owner = given_owner;
- device = AltosDeviceDialog.show(owner, Altos.product_any);
+ device = AltosDevice
UI
Dialog.show(owner, Altos.product_any);
if (device != null) {
try {
serial_line = new AltosSerial(device);
if (device != null) {
try {
serial_line = new AltosSerial(device);
@@
-297,4
+304,4
@@
public class AltosConfig implements ActionListener {
}
}
}
}
}
}
-}
\ No newline at end of file
+}