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 520575f87bffda480c1de0c15e12850647f9e337 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 04:46:45 2016 +0200 Renommages, mise en place context d'import (impacts dans les actions d'ui) --- .../java/fr/ifremer/echobase/ui/EchoBaseSession.java | 2 +- .../actions/importData/AbstractConfigureImport.java | 4 ++-- .../ui/actions/importData/AbstractLaunchImport.java | 4 ++-- .../actions/importData/ConfigureAcousticImport.java | 12 ++++++------ .../actions/importData/ConfigureCatchesImport.java | 12 ++++++------ .../ui/actions/importData/ConfigureCommonImport.java | 20 ++++++++++---------- .../actions/importData/ConfigureOperationImport.java | 12 ++++++------ .../actions/importData/ConfigureResultsImport.java | 12 ++++++------ .../ui/actions/importData/LaunchAcousticImport.java | 10 +++++----- .../ui/actions/importData/LaunchCatchesImport.java | 10 +++++----- .../ui/actions/importData/LaunchCommonImport.java | 10 +++++----- .../ui/actions/importData/LaunchOperationImport.java | 10 +++++----- .../ui/actions/importData/LaunchResultsImport.java | 10 +++++----- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java index 8ffc201..ffbb86f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java @@ -284,7 +284,7 @@ public class EchoBaseSession implements Closeable, Serializable { /** Protect session constructor. */ protected EchoBaseSession() { - store = new TreeMap<String, Object>(); + store = new TreeMap<>(); } /** diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java index 8c8fba9..49d1218 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java @@ -22,7 +22,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.io.InputFile; -import fr.ifremer.echobase.services.service.importdata.AbstractImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageImportDataConfigurationSupport; import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -38,7 +38,7 @@ import java.io.IOException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public abstract class AbstractConfigureImport<M extends AbstractImportConfiguration> extends AbstractConfigureAction<M> { +public abstract class AbstractConfigureImport<M extends VoyageImportDataConfigurationSupport> extends AbstractConfigureAction<M> { private static final long serialVersionUID = 1L; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java index 9d93e9b..4e5ea8c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java @@ -23,7 +23,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.service.importdata.AbstractImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageImportDataConfigurationSupport; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; @@ -38,7 +38,7 @@ import javax.inject.Inject; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public abstract class AbstractLaunchImport<M extends AbstractImportConfiguration, S extends EchoBaseServiceSupport> extends AbstractWaitAndExecAction<M, S> { +public abstract class AbstractLaunchImport<M extends VoyageImportDataConfigurationSupport, S extends EchoBaseServiceSupport> extends AbstractWaitAndExecAction<M, S> { private static final long serialVersionUID = 1L; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java index db8bf5e..71c1d61 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.service.importdata.AcousticImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageAcousticsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.CellPositionReference; import java.io.File; @@ -33,7 +33,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class ConfigureAcousticImport extends AbstractConfigureImport<AcousticImportConfiguration> { +public class ConfigureAcousticImport extends AbstractConfigureImport<VoyageAcousticsImportConfiguration> { private static final long serialVersionUID = 1L; @@ -43,16 +43,16 @@ public class ConfigureAcousticImport extends AbstractConfigureImport<AcousticImp protected Map<String, String> cellPositionReferences; public ConfigureAcousticImport() { - super(AcousticImportConfiguration.class); + super(VoyageAcousticsImportConfiguration.class); } @Override - protected AcousticImportConfiguration createModel() { - return new AcousticImportConfiguration(getLocale()); + protected VoyageAcousticsImportConfiguration createModel() { + return new VoyageAcousticsImportConfiguration(getLocale()); } @Override - protected void prepareInputAction(AcousticImportConfiguration model) { + protected void prepareInputAction(VoyageAcousticsImportConfiguration model) { voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); cellPositionReferences = decoratorService.decorateEnums(CellPositionReference.values()); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java index 1602670..87d141f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.service.importdata.CatchesImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import java.io.File; import java.util.Map; @@ -32,7 +32,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class ConfigureCatchesImport extends AbstractConfigureImport<CatchesImportConfiguration> { +public class ConfigureCatchesImport extends AbstractConfigureImport<VoyageCatchesImportConfiguration> { private static final long serialVersionUID = 1L; @@ -40,16 +40,16 @@ public class ConfigureCatchesImport extends AbstractConfigureImport<CatchesImpor protected Map<String, String> voyages; public ConfigureCatchesImport() { - super(CatchesImportConfiguration.class); + super(VoyageCatchesImportConfiguration.class); } @Override - protected CatchesImportConfiguration createModel() { - return new CatchesImportConfiguration(getLocale()); + protected VoyageCatchesImportConfiguration createModel() { + return new VoyageCatchesImportConfiguration(getLocale()); } @Override - protected void prepareInputAction(CatchesImportConfiguration model) { + protected void prepareInputAction(VoyageCatchesImportConfiguration model) { voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java index a96e7d7..73cf6b4 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.services.service.importdata.CommonImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCommonsImportConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +38,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportConfiguration> { +public class ConfigureCommonImport extends AbstractConfigureImport<VoyageCommonsImportConfiguration> { private static final long serialVersionUID = 1L; @@ -58,16 +58,16 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC protected Map<String, String> importTypes; public ConfigureCommonImport() { - super(CommonImportConfiguration.class); + super(VoyageCommonsImportConfiguration.class); } @Override - protected CommonImportConfiguration createModel() { - return new CommonImportConfiguration(getLocale()); + protected VoyageCommonsImportConfiguration createModel() { + return new VoyageCommonsImportConfiguration(getLocale()); } @Override - protected void prepareInputAction(CommonImportConfiguration model) { + protected void prepareInputAction(VoyageCommonsImportConfiguration model) { missions = userDbPersistenceService.loadSortAndDecorate(Mission.class); voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); areaOfOperations = userDbPersistenceService.loadSortAndDecorate(AreaOfOperation.class); @@ -121,7 +121,7 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC // mode Voyage - public CommonImportConfiguration getModelVoyage() { + public VoyageCommonsImportConfiguration getModelVoyage() { return getModel(); } @@ -139,7 +139,7 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC // mode transit - public CommonImportConfiguration getModelTransit() { + public VoyageCommonsImportConfiguration getModelTransit() { return getModel(); } @@ -158,7 +158,7 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC // mode transect - public CommonImportConfiguration getModelTransect() { + public VoyageCommonsImportConfiguration getModelTransect() { return getModel(); } @@ -176,7 +176,7 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC // mode All - public CommonImportConfiguration getModelAll() { + public VoyageCommonsImportConfiguration getModelAll() { return getModel(); } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java index ba22498..bbac755 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureOperationImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.service.importdata.OperationImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageOperationsImportConfiguration; import java.io.File; import java.util.Map; @@ -32,7 +32,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class ConfigureOperationImport extends AbstractConfigureImport<OperationImportConfiguration> { +public class ConfigureOperationImport extends AbstractConfigureImport<VoyageOperationsImportConfiguration> { private static final long serialVersionUID = 1L; @@ -40,16 +40,16 @@ public class ConfigureOperationImport extends AbstractConfigureImport<OperationI protected Map<String, String> voyages; public ConfigureOperationImport() { - super(OperationImportConfiguration.class); + super(VoyageOperationsImportConfiguration.class); } @Override - protected OperationImportConfiguration createModel() { - return new OperationImportConfiguration(getLocale()); + protected VoyageOperationsImportConfiguration createModel() { + return new VoyageOperationsImportConfiguration(getLocale()); } @Override - protected void prepareInputAction(OperationImportConfiguration model) { + protected void prepareInputAction(VoyageOperationsImportConfiguration model) { voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java index a016039..638407b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Vessel; -import fr.ifremer.echobase.services.service.importdata.ResultsImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; import java.io.File; import java.util.Map; @@ -35,7 +35,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class ConfigureResultsImport extends AbstractConfigureImport<ResultsImportConfiguration> { +public class ConfigureResultsImport extends AbstractConfigureImport<VoyageResultsImportConfiguration> { private static final long serialVersionUID = 1L; @@ -51,16 +51,16 @@ public class ConfigureResultsImport extends AbstractConfigureImport<ResultsImpor protected String resultLabel; public ConfigureResultsImport() { - super(ResultsImportConfiguration.class); + super(VoyageResultsImportConfiguration.class); } @Override - protected ResultsImportConfiguration createModel() { - return new ResultsImportConfiguration(getLocale()); + protected VoyageResultsImportConfiguration createModel() { + return new VoyageResultsImportConfiguration(getLocale()); } @Override - protected void prepareInputAction(ResultsImportConfiguration model) { + protected void prepareInputAction(VoyageResultsImportConfiguration model) { voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); vessels = userDbPersistenceService.loadSortAndDecorate(Vessel.class); importTypes = decoratorService.decorateEnums(ImportType.getResultImportType()); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java index 8c10048..b88f26b 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.service.importdata.AcousticImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageAcousticsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; @@ -32,16 +32,16 @@ import fr.ifremer.echobase.services.service.importdata.ImportException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchAcousticImport extends AbstractLaunchImport<AcousticImportConfiguration, ImportDataService> { +public class LaunchAcousticImport extends AbstractLaunchImport<VoyageAcousticsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchAcousticImport() { - super(AcousticImportConfiguration.class, ImportDataService.class); + super(VoyageAcousticsImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<AcousticImportConfiguration> doImport(ImportDataService service, AcousticImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportAcoustics(model, user); + protected ImportDataResult<VoyageAcousticsImportConfiguration> doImport(ImportDataService service, VoyageAcousticsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageAcoustics(model, user); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java index 597ff32..232359f 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.service.importdata.CatchesImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCatchesImportConfiguration; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; @@ -32,16 +32,16 @@ import fr.ifremer.echobase.services.service.importdata.ImportException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchCatchesImport extends AbstractLaunchImport<CatchesImportConfiguration, ImportDataService> { +public class LaunchCatchesImport extends AbstractLaunchImport<VoyageCatchesImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchCatchesImport() { - super(CatchesImportConfiguration.class, ImportDataService.class); + super(VoyageCatchesImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<CatchesImportConfiguration> doImport(ImportDataService service, CatchesImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportCatches(model, user); + protected ImportDataResult<VoyageCatchesImportConfiguration> doImport(ImportDataService service, VoyageCatchesImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageCatches(model, user); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java index 5e6845f..d5339e4 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonImport.java @@ -21,7 +21,7 @@ package fr.ifremer.echobase.ui.actions.importData; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.service.importdata.CommonImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageCommonsImportConfiguration; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; @@ -32,16 +32,16 @@ import fr.ifremer.echobase.services.service.importdata.ImportException; * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchCommonImport extends AbstractLaunchImport<CommonImportConfiguration, ImportDataService> { +public class LaunchCommonImport extends AbstractLaunchImport<VoyageCommonsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchCommonImport() { - super(CommonImportConfiguration.class, ImportDataService.class); + super(VoyageCommonsImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<CommonImportConfiguration> doImport(ImportDataService service, CommonImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportCommons(model, user); + protected ImportDataResult<VoyageCommonsImportConfiguration> doImport(ImportDataService service, VoyageCommonsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageCommons(model, user); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java index 847944d..89c2ed6 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchOperationImport.java @@ -24,7 +24,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; -import fr.ifremer.echobase.services.service.importdata.OperationImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageOperationsImportConfiguration; /** * TODO @@ -32,16 +32,16 @@ import fr.ifremer.echobase.services.service.importdata.OperationImportConfigurat * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchOperationImport extends AbstractLaunchImport<OperationImportConfiguration, ImportDataService> { +public class LaunchOperationImport extends AbstractLaunchImport<VoyageOperationsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchOperationImport() { - super(OperationImportConfiguration.class, ImportDataService.class); + super(VoyageOperationsImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<OperationImportConfiguration> doImport(ImportDataService service, OperationImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportOperations(model, user); + protected ImportDataResult<VoyageOperationsImportConfiguration> doImport(ImportDataService service, VoyageOperationsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageOperations(model, user); } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java index 3bb7c6f..14d4b51 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchResultsImport.java @@ -24,7 +24,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdata.ImportDataResult; import fr.ifremer.echobase.services.service.importdata.ImportDataService; import fr.ifremer.echobase.services.service.importdata.ImportException; -import fr.ifremer.echobase.services.service.importdata.ResultsImportConfiguration; +import fr.ifremer.echobase.services.service.importdata.configurations.VoyageResultsImportConfiguration; /** * Configure a "result" import. @@ -32,17 +32,17 @@ import fr.ifremer.echobase.services.service.importdata.ResultsImportConfiguratio * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class LaunchResultsImport extends AbstractLaunchImport<ResultsImportConfiguration, ImportDataService> { +public class LaunchResultsImport extends AbstractLaunchImport<VoyageResultsImportConfiguration, ImportDataService> { private static final long serialVersionUID = 1L; public LaunchResultsImport() { - super(ResultsImportConfiguration.class, ImportDataService.class); + super(VoyageResultsImportConfiguration.class, ImportDataService.class); } @Override - protected ImportDataResult<ResultsImportConfiguration> doImport(ImportDataService service, ResultsImportConfiguration model, EchoBaseUser user) throws ImportException { - return service.doImportResults(model, user); + protected ImportDataResult<VoyageResultsImportConfiguration> doImport(ImportDataService service, VoyageResultsImportConfiguration model, EchoBaseUser user) throws ImportException { + return service.doImportVoyageResults(model, user); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.