This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 55bd07d222f1689ac8a4842f4804b64162643971 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 5 12:32:14 2015 +0100 utilisation de methode de service pour creer le modele de progression --- .../tutti/ui/swing/action/ExportCruiseAction.java | 21 +++++------------- .../tutti/ui/swing/action/ExportProgramAction.java | 25 +++++----------------- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java index 532cfe4..08b098f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java @@ -91,31 +91,20 @@ public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { - log.info("Will save cruise " + cruise.getId() + - " to file: " + file); + log.info("Will save cruise " + cruise.getId() + " to file: " + file); } - ProgressionModel progressionModel = new ProgressionModel(); - setProgressionModel(progressionModel); - // (check cruise / export cruise / gear caracteristics / operation / parameter / accidental catches / catches / individual observation / species) / zip - progressionModel.setTotal(10); + TuttiExportService service = getContext().getTuttiExportService(); -// TuttiProtocol protocol = null; -// if (getContext().isProtocolFilled()) { -// protocol = getDataContext().getProtocol(); -// if (log.isInfoEnabled()) { -// log.info("Will use protocol " + protocol.getName()); -// } -// } + ProgressionModel progressionModel = service.createExportCruiseProgessionModel(); + setProgressionModel(progressionModel); ApplicationBusinessException exportError = null; - TuttiExportService service = getContext().getTuttiExportService(); try { service.exportCruise(cruise.getId(), file, progressionModel); - sendMessage(t("tutti.exportCruise.action.success", - cruise.getName(), file.getName())); + sendMessage(t("tutti.exportCruise.action.success", cruise.getName(), file.getName())); } catch (ApplicationBusinessException e) { String errorMessage; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java index 09e7670..fd1f231 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.ProgressionModel; -import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.export.generic.TuttiExportService; import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUI; @@ -35,7 +34,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; import java.io.File; -import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -91,28 +89,15 @@ public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel Preconditions.checkNotNull(file); if (log.isInfoEnabled()) { - log.info("Will save program " + program.getId() + - " to file: " + file); + log.info("Will save program " + program.getId() + " to file: " + file); } - // nbCruise * (check cruise / export cruise / gear caracteristics / operation / parameter / catches / individual observation / accidental catches / species) + zip - List<Cruise> allCruise = - getContext().getPersistenceService().getAllCruise(program.getId()); - - ProgressionModel progressionModel = new ProgressionModel(); - setProgressionModel(progressionModel); - progressionModel.setTotal(9 * allCruise.size() + 1); - -// TuttiProtocol protocol = null; -// if (getContext().isProtocolFilled()) { -// protocol = getDataContext().getProtocol(); -// if (log.isInfoEnabled()) { -// log.info("Will use protocol " + protocol.getName()); -// } -// } + TuttiExportService service = getContext().getTuttiExportService(); + + ProgressionModel progressionModel = service.createExportProgramProgessionModel(program.getId()); + ApplicationBusinessException exportError = null; - TuttiExportService service = getContext().getTuttiExportService(); try { service.exportProgram(program.getId(), file, progressionModel); } catch (ApplicationBusinessException e) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.