projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/micropeak-logging'
[fw/altos]
/
altosui
/
AltosEepromManage.java
diff --git
a/altosui/AltosEepromManage.java
b/altosui/AltosEepromManage.java
index e6739e770eb0f55e572d3876a174e8d11e82a13e..cc9adb0c4c504f334fdc1f76629b312cca4ebae6 100644
(file)
--- a/
altosui/AltosEepromManage.java
+++ b/
altosui/AltosEepromManage.java
@@
-22,6
+22,7
@@
import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
import java.io.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
public class AltosEepromManage implements ActionListener {
public class AltosEepromManage implements ActionListener {
@@
-153,7
+154,7
@@
public class AltosEepromManage implements ActionListener {
ee.getLocalizedMessage(),
JOptionPane.ERROR_MESSAGE);
} else if (e instanceof TimeoutException) {
ee.getLocalizedMessage(),
JOptionPane.ERROR_MESSAGE);
} else if (e instanceof TimeoutException) {
- TimeoutException te = (TimeoutException) e;
+
//
TimeoutException te = (TimeoutException) e;
JOptionPane.showMessageDialog(frame,
String.format("Communications failed with \"%s\"",
device.toShortString()),
JOptionPane.showMessageDialog(frame,
String.format("Communications failed with \"%s\"",
device.toShortString()),
@@
-194,10
+195,10
@@
public class AltosEepromManage implements ActionListener {
public AltosEepromManage(JFrame given_frame) {
public AltosEepromManage(JFrame given_frame) {
-
boolean
running = false;
+
//boolean
running = false;
frame = given_frame;
frame = given_frame;
- device = AltosDeviceDialog.show(frame, Altos.product_any);
+ device = AltosDevice
UI
Dialog.show(frame, Altos.product_any);
remote = false;
remote = false;