projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix config to set default log size for all devices with log
[fw/altos]
/
altosui
/
AltosConfig.java
diff --git
a/altosui/AltosConfig.java
b/altosui/AltosConfig.java
index 4927d3f822e0ad9b73fc2cf6c1fab9c9137eb456..2cf69525fea1e468d5ab40a502b224d9c64530bd 100644
(file)
--- a/
altosui/AltosConfig.java
+++ b/
altosui/AltosConfig.java
@@
-22,8
+22,8
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.text.*;
import java.io.*;
import java.util.concurrent.*;
import java.text.*;
-import org.altusmetrum.altoslib_
1
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altosuilib_
2
.*;
public class AltosConfig implements ActionListener {
public class AltosConfig implements ActionListener {
@@
-161,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();
}
}
}
}
@@
-242,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) {
@@
-298,4
+304,4
@@
public class AltosConfig implements ActionListener {
}
}
}
}
}
}
-}
\ No newline at end of file
+}