X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromManage.java;h=aa43ab9ee3c4f740187bc3f391f387b14ec54f19;hp=083c73725d44e4f2fa928ce8532b2fd8f7bb363d;hb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9;hpb=1c344b760776cd5d8c0297d8db9bf02687381b4e

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index 083c7372..aa43ab9e 100644
--- a/altosui/AltosEepromManage.java
+++ b/altosui/AltosEepromManage.java
@@ -17,18 +17,12 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosEepromManage implements ActionListener {
 
@@ -39,8 +33,6 @@ public class AltosEepromManage implements ActionListener {
 	AltosEepromList		flights;
 	AltosEepromDownload	download;
 	AltosEepromDelete	delete;
-	boolean			any_download;
-	boolean			any_delete;
 
 	public void finish() {
 		if (serial_line != null) {
@@ -53,11 +45,20 @@ 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 = "";
 
 		for (AltosEepromLog flight : flights) {
-			if (flight.delete) {
+			if (flight.selected) {
 				if (result.equals(""))
 					result = String.format("%d", flight.flight);
 				else
@@ -67,22 +68,43 @@ public class AltosEepromManage implements ActionListener {
 		return result;
 	}
 
+	public boolean download_done() {
+		AltosEepromSelect	select = new AltosEepromSelect(frame, flights, "Delete");
+
+		if (select.run()) {
+			boolean any_selected = false;
+			for (AltosEepromLog flight : flights)
+				any_selected = any_selected || flight.selected;
+			if (any_selected) {
+				delete = new AltosEepromDelete(frame,
+							       serial_line,
+							       remote,
+							       flights);
+				delete.addActionListener(this);
+				/*
+				 * Start flight log delete
+				 */
+
+				delete.start();
+				return true;
+			}
+		}
+		return false;
+	}
+
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
 		boolean	success = e.getID() != 0;
 		boolean running = false;
 
 		if (cmd.equals("download")) {
-			if (success) {
-				if (any_delete) {
-					delete.start();
-					running = true;
-				}
-			}
+			if (success)
+				running = download_done();
 		} 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);
@@ -104,40 +126,28 @@ public class AltosEepromManage implements ActionListener {
 							      serial_line.device.toShortString(),
 							      JOptionPane.INFORMATION_MESSAGE);
 			} else {
-				AltosEepromSelect	select = new AltosEepromSelect(frame, flights);
+				AltosEepromSelect	select = new AltosEepromSelect(frame, flights, "Download");
 
 				if (select.run()) {
-					for (AltosEepromLog flight : flights) {
-						any_download = any_download || flight.download;
-						any_delete = any_delete || flight.delete;
-					}
-					if (any_download) {
-						download = new AltosEepromDownload(frame,
+					boolean any_selected = false;
+					for (AltosEepromLog flight : flights)
+						any_selected = any_selected || flight.selected;
+					if (any_selected) {
+						AltosEepromMonitorUI monitor = new AltosEepromMonitorUI(frame);
+						monitor.addActionListener(this);
+						serial_line.set_frame(frame);
+						download = new AltosEepromDownload(monitor,
 										   serial_line,
 										   remote,
 										   flights);
-						download.addActionListener(this);
-					}
+						/*
+						 * Start flight log download
+						 */
 
-					if (any_delete) {
-						delete = new AltosEepromDelete(frame,
-									       serial_line,
-									       remote,
-									       flights);
-						delete.addActionListener(this);
-					}
-
-					/*
-					 * Start flight log download
-					 */
-
-					if (any_download) {
 						download.start();
 						running = true;
-					}
-					else if (any_delete) {
-						delete.start();
-						running = true;
+					} else {
+						running = download_done();
 					}
 				}
 			}
@@ -156,7 +166,7 @@ public class AltosEepromManage implements ActionListener {
 						      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()),
@@ -197,14 +207,12 @@ public class AltosEepromManage implements ActionListener {
 
 	public AltosEepromManage(JFrame given_frame) {
 
-		boolean	running = false;
+		//boolean	running = false;
 
 		frame = given_frame;
-		device = AltosDeviceDialog.show(frame, Altos.product_any);
+		device = AltosDeviceUIDialog.show(frame, Altos.product_any);
 
 		remote = false;
-		any_download = false;
-		any_delete = false;
 
 		if (device != null) {
 			try {