Author: tchemit Date: 2014-03-20 11:24:32 +0100 (Thu, 20 Mar 2014) New Revision: 1628 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1628 Log: fixes #4796: [EXPORT GENERIQUE] Tentative d'export m?\195?\170me si l'?\195?\169l?\195?\169vation des poids ne fonctionne pas. Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-03-20 09:01:50 UTC (rev 1627) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-03-20 10:24:32 UTC (rev 1628) @@ -29,9 +29,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import org.nuiton.jaxx.application.ApplicationBusinessException; -import org.nuiton.jaxx.application.ApplicationIOUtil; -import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -61,6 +58,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.BufferedWriter; import java.io.Closeable; @@ -194,7 +194,6 @@ } // check cruise fishing operations - ApplicationBusinessException checkError = null; try { checkCruise(progressionModel, cruise, null); } catch (ApplicationBusinessException e) { @@ -202,7 +201,7 @@ if (log.isDebugEnabled()) { log.debug("Got a check cruise error", e); } - checkError = e; + throw e; } File basedir = new File(context.getConfig().newTempFile( @@ -223,11 +222,6 @@ } finally { IOUtils.closeQuietly(exportContext); } - - if (checkError != null) { - // rethrow error - throw checkError; - } } /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-03-20 09:01:50 UTC (rev 1627) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-03-20 10:24:32 UTC (rev 1628) @@ -113,6 +113,9 @@ TuttiExportService service = getContext().getTuttiExportService(); try { service.exportCruise(cruise.getId(), file, progressionModel); + + sendMessage(t("tutti.exportCruise.action.success", + cruise.getName(), file.getName())); } catch (ApplicationBusinessException e) { String errorMessage; @@ -120,9 +123,6 @@ exportError = new ApplicationBusinessException(errorMessage); } - sendMessage(t("tutti.exportCruise.action.success", - cruise.getName(), file.getName())); - handler.resetEditCruiseAction(); if (exportError != null) {