Author: fdesbois Date: 2012-09-25 11:54:48 +0200 (Tue, 25 Sep 2012) New Revision: 594 Url: http://forge.codelutin.com/repositories/revision/sammoa/594 Log: fixes #1526 : add confirm for stop flight Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-25 09:47:19 UTC (rev 593) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/action/StopAction.java 2012-09-25 09:54:48 UTC (rev 594) @@ -24,7 +24,9 @@ package fr.ulr.sammoa.ui.swing.flight.action; import fr.ulr.sammoa.application.flightController.FlightState; +import fr.ulr.sammoa.ui.swing.flight.FlightUI; import fr.ulr.sammoa.ui.swing.flight.FlightUIModel; +import fr.ulr.sammoa.ui.swing.util.SammoaUtil; import jaxx.runtime.JAXXContext; import org.nuiton.util.Resource; @@ -50,7 +52,9 @@ @Override public void actionPerformed(ActionEvent e) { - getFlightController().stop(); + if (SammoaUtil.askQuestion((FlightUI) context, _("sammoa.confirmDialog.stopFlight.message"))) { + getFlightController().stop(); + } } @Override Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-25 09:47:19 UTC (rev 593) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-09-25 09:54:48 UTC (rev 594) @@ -77,6 +77,7 @@ sammoa.confirmDialog.flightInProgress.message.exit=A flight is in progress, are you sure you want to quit ? sammoa.confirmDialog.flightInProgress.message.showHome=A flight is in progress, are you sure you want to go back to the home screen ? sammoa.confirmDialog.flightInProgress.title=Flight in progress +sammoa.confirmDialog.stopFlight.message=Are you sure you want to stop the flight ? no more actions (observation, begin, add, ...) could be done after stop. sammoa.confirmDialog.validation.delete.message=Are you sure you want to definitely delete this %s ? sammoa.confirmDialog.validation.deleteByCascade.message=This %1$s contains some deleted %2$ss, do you want to continue ? This will definitely delete %2$s marked as deleted. sammoa.datePattern=dd/MM/yyyy