projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Errata fix isn't needed for discontinued products
[fw/altos]
/
altosui
/
AltosEepromManage.java
diff --git
a/altosui/AltosEepromManage.java
b/altosui/AltosEepromManage.java
index 27b03bedb876c69a301e5b2208657d27400f0b7a..e363557141547dc0d92f46719b924ee010ec7c57 100644
(file)
--- a/
altosui/AltosEepromManage.java
+++ b/
altosui/AltosEepromManage.java
@@
-15,21
+15,14
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-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 org.altusmetrum.AltosLib.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosEepromManage implements ActionListener {
public class AltosEepromManage implements ActionListener {
@@
-52,6
+45,15
@@
public class AltosEepromManage implements ActionListener {
}
}
}
}
+ private int countDeletedFlights() {
+ int count = 0;
+ for (AltosEepromLog flight : flights) {
+ if (flight.selected)
+ count++;
+ }
+ return count;
+ }
+
private String showDeletedFlights() {
String result = "";
private String showDeletedFlights() {
String result = "";
@@
-101,7
+103,8
@@
public class AltosEepromManage implements ActionListener {
} else if (cmd.equals("delete")) {
if (success) {
JOptionPane.showMessageDialog(frame,
} else if (cmd.equals("delete")) {
if (success) {
JOptionPane.showMessageDialog(frame,
- String.format("Flights erased: %s",
+ String.format("%d flights erased: %s",
+ countDeletedFlights(),
showDeletedFlights()),
serial_line.device.toShortString(),
JOptionPane.INFORMATION_MESSAGE);
showDeletedFlights()),
serial_line.device.toShortString(),
JOptionPane.INFORMATION_MESSAGE);
@@
-130,11
+133,13
@@
public class AltosEepromManage implements ActionListener {
for (AltosEepromLog flight : flights)
any_selected = any_selected || flight.selected;
if (any_selected) {
for (AltosEepromLog flight : flights)
any_selected = any_selected || flight.selected;
if (any_selected) {
- download = new AltosEepromDownload(frame,
+ AltosEepromMonitorUI monitor = new AltosEepromMonitorUI(frame);
+ monitor.addActionListener(this);
+ serial_line.set_frame(frame);
+ download = new AltosEepromDownload(monitor,
serial_line,
remote,
flights);
serial_line,
remote,
flights);
- download.addActionListener(this);
/*
* Start flight log download
*/
/*
* Start flight log download
*/
@@
-161,7
+166,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()),
@@
-202,10
+207,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;