This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit d4e6f56107931c0f99c8a4b1ea8c8c63c2e28067 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 1 23:23:45 2016 +0200 Utilisation des bons contrats --- .../echobase/services/service/importdata/ImportDataResult.java | 4 ++-- .../echobase/services/service/importdata/ImportDataService.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java index 2a85863..b115648 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java @@ -1,7 +1,7 @@ package fr.ifremer.echobase.services.service.importdata; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.service.importdata.configurations.VoyageImportDataConfigurationSupport; +import fr.ifremer.echobase.services.service.importdata.configurations.ImportDataConfigurationSupport; import java.util.Collections; import java.util.Set; @@ -11,7 +11,7 @@ import java.util.Set; * * @author Tony Chemit - chemit@codelutin.com */ -public class ImportDataResult<C extends VoyageImportDataConfigurationSupport> { +public class ImportDataResult<C extends ImportDataConfigurationSupport> { private final C configuration; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java index 3a33117..a0e27a4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java @@ -33,6 +33,7 @@ import fr.ifremer.echobase.services.service.importdata.actions.VoyageResultsRegi import fr.ifremer.echobase.services.service.importdata.actions.VoyageResultsVoyageEchotypeImportAction; import fr.ifremer.echobase.services.service.importdata.actions.VoyageResultsVoyageLengthAgeKeyImportAction; import fr.ifremer.echobase.services.service.importdata.actions.VoyageResultsVoyageLengthWeightKeyImportAction; +import fr.ifremer.echobase.services.service.importdata.configurations.ImportDataConfigurationSupport; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageAcousticsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCommonsImportConfiguration; @@ -435,7 +436,7 @@ public class ImportDataService extends EchoBaseServiceSupport { return l(getLocale(), configuration.getImportType().getI18nKey()); } - public interface ImportDataAction<M extends VoyageImportDataConfigurationSupport> { + public interface ImportDataAction<M extends ImportDataConfigurationSupport> { ImportDataResult<M> doImport(ImportDataService service, M configuration, EchoBaseUser user) throws ImportException; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.