From 2d154be89246e111a36f7c2700effbb2c97da541 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 14 Jan 2011 16:44:50 -0800 Subject: [PATCH] altosui: Show dialog after successful delete or when no flights Make sure the user always sees confirmation for flight log management. Signed-off-by: Keith Packard --- altosui/AltosEepromManage.java | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java index b64ee525..2704f883 100644 --- a/altosui/AltosEepromManage.java +++ b/altosui/AltosEepromManage.java @@ -50,6 +50,20 @@ public class AltosEepromManage implements ActionListener { } } + private String showDeletedFlights() { + String result = ""; + + for (AltosEepromLog flight : flights) { + if (flight.delete) { + if (result.equals("")) + result = String.format("%d", flight.flight); + else + result = String.format("%s, %d", result, flight.flight); + } + } + return result; + } + public void actionPerformed(ActionEvent e) { String cmd = e.getActionCommand(); boolean success = e.getID() != 0; @@ -57,15 +71,19 @@ public class AltosEepromManage implements ActionListener { System.out.printf("Eeprom manager action %s %d\n", cmd, e.getID()); if (cmd.equals("download")) { if (success) { - System.out.printf("Download succeeded\n"); if (any_delete) delete.start(); else finish(); } } else if (cmd.equals("delete")) { - if (success) - System.out.printf("Delete succeeded\n"); + if (success) { + JOptionPane.showMessageDialog(frame, + String.format("Flights erased: %s", + showDeletedFlights()), + serial_line.device.toShortString(), + JOptionPane.INFORMATION_MESSAGE); + } finish(); } } @@ -88,6 +106,11 @@ public class AltosEepromManage implements ActionListener { flights = new AltosEepromList(serial_line, remote); if (flights.size() == 0) { + JOptionPane.showMessageDialog(frame, + String.format("No flights available on %d", + device.getSerial()), + serial_line.device.toShortString(), + JOptionPane.INFORMATION_MESSAGE); } else { AltosEepromSelect select = new AltosEepromSelect(frame, flights); -- 2.30.2