Author: tchemit Date: 2013-09-25 19:12:02 +0200 (Wed, 25 Sep 2013) New Revision: 1228 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1228 Log: refs #3313: [EXPORT GENERIQUE] Ne pas bloquer l'export en cas de probl?\195?\168me sur l'?\195?\169l?\195?\169vation (improve error display in ui) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-09-25 17:03:03 UTC (rev 1227) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-09-25 17:12:02 UTC (rev 1228) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.export.TuttiExportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -108,22 +107,25 @@ } } + TuttiBusinessException exportError = null; + TuttiExportService service = getContext().getTuttiExportService(); try { service.exportCruise(cruise.getId(), protocol, file, progressionModel); } catch (TuttiBusinessException e) { - String message = _("tutti.exportCruise.action.exportErrors", cruise.getName(), e.getMessage()); - TuttiUIContext.getErrorHelper().showErrorDialog(message); + + String errorMessage; + errorMessage = _("tutti.exportCruise.action.exportErrors", cruise.getName(), e.getMessage()); + exportError = new TuttiBusinessException(errorMessage); } - getHandler().resetEditCruiseAction(); - } - - @Override - public void postSuccessAction() { - super.postSuccessAction(); - Cruise cruise = getModel().getCruise(); sendMessage(_("tutti.exportCruise.action.success", cruise.getName(), file.getName())); + + handler.resetEditCruiseAction(); + + if (exportError != null) { + throw exportError; + } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-09-25 17:03:03 UTC (rev 1227) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-09-25 17:12:02 UTC (rev 1228) @@ -31,7 +31,6 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.export.TuttiExportService; -import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,7 +67,7 @@ // choose file to export file = saveFile( - "exportProgram-" + program.getName() ,"zip", + "exportProgram-" + program.getName(), "zip", _("tutti.selectCruise.title.choose.exportProgramFile"), _("tutti.selectCruise.action.chooseProgramExportFile"), "^.+\\.zip$", _("tutti.common.file.zip") @@ -110,22 +109,26 @@ log.info("Will use protocol " + protocol.getName()); } } + TuttiBusinessException exportError = null; + TuttiExportService service = getContext().getTuttiExportService(); try { service.exportProgram(program.getId(), protocol, file, progressionModel); } catch (TuttiBusinessException e) { - TuttiBusinessException e2 = new TuttiBusinessException("Des erreurs sont apparues pendant l'élévation des poids<hr/>L'export a cependant été réalisé.", e.getCause()); - TuttiUIContext.getErrorHelper().showErrorDialog(null, e2); + + String errorMessage; + errorMessage = _("tutti.exportProgram.action.exportErrors", program.getName(), e.getMessage()); + + exportError = new TuttiBusinessException(errorMessage); } - getHandler().resetEditProgramAction(); - } + handler.resetEditProgramAction(); - @Override - public void postSuccessAction() { - super.postSuccessAction(); - Program program = getModel().getProgram(); sendMessage(_("tutti.exportProgram.action.success", program.getName(), file.getName())); + + if (exportError != null) { + throw exportError; + } } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-25 17:03:03 UTC (rev 1227) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-25 17:12:02 UTC (rev 1228) @@ -1023,6 +1023,7 @@ tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable) tutti.error.write.startActionFile=impossible d'écrire dans le fichier %s tutti.exportCruise.action.exportErrors=Des erreurs sont apparues pendant l'élévation des poids de la campagne <strong>%s</strong>.<br/>L'export a cependant été réalisé.<hr/>Erreur(s) rencontrée(s) \: <br/>%s +tutti.exportProgram.action.exportErrors=Des erreurs sont apparues pendant l'élévation des poids d'une campagne de la série <strong>%s</strong>.<br/>L'export a cependant été réalisé.<hr/>Erreur(s) rencontrée(s) \: <br/>%s tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>. tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatra.action.success=Les captures ont correctement été exporté dans le fichier %s