branch develop updated (f9ae5e9 -> c0b65b9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from f9ae5e9 fixes #7199: [IMPORT paramètres] La lecture de l'entête du fichier ne tient pas compte des " Merge branch 'feature/7199' into develop new c0b65b9 correction aussi à l'import des caractéristiques du trait (refs #7199) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c0b65b9eb9444a9ab97e0931fdbc8df9dc4b3258 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 15:08:35 2015 +0200 correction aussi à l'import des caractéristiques du trait (refs #7199) Summary of changes: .../service/operationimport/FishingOperationImportService.java | 9 +++++---- ...ImportFishingOperationCaracteristicsFromColumnFileAction.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 c0b65b9eb9444a9ab97e0931fdbc8df9dc4b3258 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jun 9 15:08:35 2015 +0200 correction aussi à l'import des caractéristiques du trait (refs #7199) --- .../service/operationimport/FishingOperationImportService.java | 9 +++++---- ...ImportFishingOperationCaracteristicsFromColumnFileAction.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java index 1fb6c1f..f34b85c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.service.operationimport; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -35,20 +34,22 @@ import fr.ifremer.tutti.service.AbstractTuttiService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.AbstractImportErrorInfo; import org.nuiton.csv.Import2; import org.nuiton.csv.ImportConf; import org.nuiton.csv.ImportRow; -import org.nuiton.csv.ext.CsvReaders; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.util.DateUtil; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.IOException; import java.util.Date; import java.util.HashSet; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -72,10 +73,10 @@ public class FishingOperationImportService extends AbstractTuttiService { dataContext = context.getDataContext(); } - public void importCaracteristicsFromColumnFile(File columnsFile, FishingOperation fishingoperation) throws ImportFromColumnFileInvalidRowException, ImportFromColumnFileFishingOperationNotFoundException, ImportFromColumnFileMissingHeaderException { + public void importCaracteristicsFromColumnFile(File columnsFile, FishingOperation fishingoperation) throws ImportFromColumnFileInvalidRowException, ImportFromColumnFileFishingOperationNotFoundException, ImportFromColumnFileMissingHeaderException, IOException { // Get import file headers - Set<String> headers = Sets.newHashSet(CsvReaders.getHeader(columnsFile, ';')); + List<String> headers =getService(ProtocolImportExportService.class).loadProtocolCaracteristicsImportColumns(columnsFile); // Create import model ImportFromColumnFileModel importModel = new ImportFromColumnFileModel(';', new HashSet<>(headers), persistenceService, dataContext, fishingoperation); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java index 0d7ee6d..f3f0396 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java @@ -43,6 +43,7 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import java.io.File; +import java.io.IOException; import static org.nuiton.i18n.I18n.t; @@ -84,7 +85,7 @@ public class ImportFishingOperationCaracteristicsFromColumnFileAction extends Lo } @Override - public void doAction() throws ImportFromColumnFileInvalidRowException, ImportFromColumnFileFishingOperationNotFoundException, ImportFromColumnFileMissingHeaderException { + public void doAction() throws ImportFromColumnFileInvalidRowException, ImportFromColumnFileFishingOperationNotFoundException, ImportFromColumnFileMissingHeaderException, IOException { EditFishingOperationUIModel model = getModel(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm