This is an automated email from the git hooks/post-receive script. New commit to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git commit a0916bffb802d19478a65c0fecd3f44eaa0de104 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 10:58:08 2016 +0100 merge with develop --- .../service/pupitri/PupitriImportService.java | 22 ++++++++++++++-------- .../pupitri/PupitriImportServiceEvo6592Test.java | 4 ++-- .../species/actions/ImportPupitriAction.java | 14 +++++--------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index c37edf6..e8954d5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -143,20 +143,22 @@ public class PupitriImportService extends AbstractTuttiService { /** * Used merely in tests. - * @param trunkFile - * @param carrouselFile - * @param operation - * @param catchBatch - * @return + * @param trunkFile incoming trunk file + * @param carrouselFile incoming carroussle file + * @param operation target operation + * @param catchBatch target catch batch + * @return the number of rows of the .car file which have not been imported */ public PupitriImportResult importPupitri(File trunkFile, File carrouselFile, FishingOperation operation, CatchBatch catchBatch) { + return importPupitri(trunkFile, carrouselFile, operation, catchBatch, false); } /** + * Used merely in tests. * @param trunkFile incoming trunk file * @param carrouselFile incoming carroussle file * @param operation target operation @@ -170,19 +172,21 @@ public class PupitriImportService extends AbstractTuttiService { CatchBatch catchBatch, boolean importMissingCategoryBatches) { - PupitriImportResult result = readImportPupitri(trunkFile, carrouselFile, operation); - return saveImportPupitri(trunkFile, carrouselFile, operation, catchBatch, result); + PupitriImportResult result = readImportPupitri(trunkFile, carrouselFile, operation, importMissingCategoryBatches); + return saveImportPupitri(trunkFile, carrouselFile, operation, catchBatch, importMissingCategoryBatches, result); } /** * @param trunkFile incoming trunk file * @param carrouselFile incoming carroussle file * @param operation target operation + * @param importMissingCategoryBatches import or not empty batches for missing sex or size batches * @return the number of rows of the .car file which have not been imported */ public PupitriImportResult readImportPupitri(File trunkFile, File carrouselFile, - FishingOperation operation) { + FishingOperation operation, + boolean importMissingCategoryBatches) { PupitriImportResult result = new PupitriImportResult(); @@ -196,12 +200,14 @@ public class PupitriImportService extends AbstractTuttiService { * @param trunkFile incoming trunk file * @param carrouselFile incoming carroussle file * @param operation target operation + * @param importMissingCategoryBatches import or not empty batches for missing sex or size batches * @return the number of rows of the .car file which have not been imported */ public PupitriImportResult saveImportPupitri(File trunkFile, File carrouselFile, FishingOperation operation, CatchBatch catchBatch, + boolean importMissingCategoryBatches, PupitriImportResult result) { if (result.isFishingOperationFound()) { diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java index eae13ab..3a2783c 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java @@ -71,9 +71,9 @@ public class PupitriImportServiceEvo6592Test extends PupitryImportServiceTestSup BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); - PupitriImportResult pupitriImportResult = service.readImportPupitri(trunk, carroussel, operation); + PupitriImportResult pupitriImportResult = service.readImportPupitri(trunk, carroussel, operation, false); pupitriImportResult.setMelagTotalWeight(200); - pupitriImportResult = service.saveImportPupitri(trunk, carroussel, operation, catchBatch, pupitriImportResult); + pupitriImportResult = service.saveImportPupitri(trunk, carroussel, operation, catchBatch, false, pupitriImportResult); Assert.assertTrue(pupitriImportResult.isFishingOperationFound()); int nbNotAdded = pupitriImportResult.getNbCarrousselNotImported(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java index 30ba626..a7bfaa6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java @@ -31,17 +31,12 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.pupitri.PupitriImportResult; import fr.ifremer.tutti.service.pupitri.PupitriImportService; -<<<<<<< HEAD -======= -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUIModel; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.EditFishingOperationAction; ->>>>>>> ajout de la conf dans l'ui (fixes #6116) import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriMelagWeightPopupUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.ImportPupitriPopupUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; @@ -166,7 +161,8 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, PupitriImportService service = getContext().getPupitriImportService(); importResult = service.readImportPupitri(importedTrunkFile, importedCarrouselFile, - operation); + operation, + importMissingBatches); result = importResult.isFishingOperationFound(); @@ -206,8 +202,8 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, importedCarrouselFile, operation, catchBatch, - importResult, - true); + importMissingBatches, + importResult); if (importResult.isFishingOperationFound()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.