[Tutti-commits] 41/98: better API

16 Feb 2015

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 7005b0c7b4f76d477c4a94410e58757486a2cfcd
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Feb 11 11:54:46 2015 +0100

    better API
---
 .../service/genericformat/GenericFormatExportService.java | 15 ++++++---------
 .../ifremer/tutti/ui/swing/action/ExportCruiseAction.java |  7 +++----
 .../tutti/ui/swing/action/ExportProgramAction.java        |  7 ++++---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java
index becbd4a..59212d1 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java
@@ -141,16 +141,15 @@ public class GenericFormatExportService extends AbstractTuttiService {
 
     }
 
-    public ProgressionModel createExportProgramProgessionModel(String programId) {
+    public int getExportProgramNbSteps(String programId) {
 
         // nbCruise * (check cruise / export cruise / gear caracteristics / operation / parameter / catches / individual observation / accidental catches / marine litters) +
         // (species + sampleCategoryModel + protocol + temporary gear + temporary person + temporar species +  temporary vessel + zip)
 
         List<Cruise> allCruise = persistenceService.getAllCruise(programId);
 
-        ProgressionModel progressionModel = new ProgressionModel();
-        progressionModel.setTotal(9 * allCruise.size() + 8);
-        return progressionModel;
+        int result = 9 * allCruise.size() + 8;
+        return result;
 
     }
 
@@ -206,14 +205,12 @@ public class GenericFormatExportService extends AbstractTuttiService {
 
     }
 
-    public ProgressionModel createExportCruiseProgessionModel() {
+    public int getExportCruiseNbSteps() {
 
         // (check cruise / export cruise / gear caracteristics / operation / parameter / catches / individual observation / accidental catches / marine litter) +
         // (species + sampleCategoryModel + protocol + temporary gear + temporary person + temporar species +  temporary vessel + zip)
-
-        ProgressionModel progressionModel = new ProgressionModel();
-        progressionModel.setTotal(9 + 8);
-        return progressionModel;
+        int result = 9 + 8;
+        return result;
 
     }
 
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 b66ef48..6d2535e 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
@@ -23,7 +23,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.service.genericformat.GenericFormatExportService;
 import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUI;
@@ -96,13 +95,13 @@ public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel,
 
         GenericFormatExportService service = getContext().getTuttiExportService();
 
-        ProgressionModel progressionModel = service.createExportCruiseProgessionModel();
-        setProgressionModel(progressionModel);
+        int nbSteps = service.getExportCruiseNbSteps();
+        createProgressionModelIfRequired(nbSteps);
 
         ApplicationBusinessException exportError = null;
 
         try {
-            service.exportCruise(cruise.getId(), file, progressionModel);
+            service.exportCruise(cruise.getId(), file, getProgressionModel());
 
             sendMessage(t("tutti.exportCruise.action.success", cruise.getName(), file.getName()));
         } catch (ApplicationBusinessException e) {
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 2c4c09e..d0bda41 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
@@ -23,7 +23,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.Program;
 import fr.ifremer.tutti.service.genericformat.GenericFormatExportService;
 import fr.ifremer.tutti.ui.swing.content.home.SelectCruiseUI;
@@ -94,12 +93,14 @@ public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel
 
         GenericFormatExportService service = getContext().getTuttiExportService();
 
-        ProgressionModel progressionModel = service.createExportProgramProgessionModel(program.getId());
+        int nbSteps = service.getExportProgramNbSteps(program.getId());
+
+        createProgressionModelIfRequired(nbSteps);
 
         ApplicationBusinessException exportError = null;
 
         try {
-            service.exportProgram(program.getId(), file, progressionModel);
+            service.exportProgram(program.getId(), file, getProgressionModel());
         } catch (ApplicationBusinessException e) {
 
             String errorMessage;

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 41/98: better API

codelutin.com scm