Author: tchemit Date: 2012-09-06 10:42:45 +0200 (Thu, 06 Sep 2012) New Revision: 625 Url: http://forge.codelutin.com/repositories/revision/echobase/625 Log: refs #1437: Suppression des imports (ajout table ImportLog + refonte des imports: utilisation ImportType) Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ImportMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/Common2ImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonImportServiceIT.java Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties trunk/echobase-domain/src/main/xmi/echobase.properties trunk/echobase-domain/src/main/xmi/echobase.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java trunk/echobase-services/update-import-data-db.sh trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-06 08:42:45 UTC (rev 625) @@ -0,0 +1,80 @@ +package fr.ifremer.echobase.entities; + +import fr.ifremer.echobase.I18nAble; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Define what import has been done. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.2 + */ +public enum ImportType implements I18nAble { + + /** Import Voyage / Transit / Transect. */ + COMMON_ALL(n_("echobase.common.importType.commonDataAll")), + + /** Import all common data from Transect to Operation. */ + COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect")), + + /** Import operations common data. */ + OPERATION(n_("echobase.common.importType.operation")), + + /** Import catches data (unsorted, total, but no individual ones). */ + CATCHES(n_("echobase.common.importType.catches")), + + /** Import accoustic data (Cells ESDU and Elementary). */ + ACOUSTIC(n_("echobase.common.importType.acoustic")), + + /** Import results at voyage level. */ + RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage")), + + /** Import esdu results by echotype. */ + RESULT_ESDU(n_("echobase.common.importType.resultsEsdu")), + + /** Import cells Region. */ + RESULT_REGION(n_("echobase.common.importType.resultsRegion")), + + /** Import cells Map. */ + RESULT_MAP(n_("echobase.common.importType.resultsMap")); + + /** + * All common import types. + * + * @since 1.2 + */ + protected static final ImportType[] COMMON_IMPORT_TYPES = new ImportType[]{ + ImportType.COMMON_ALL, + ImportType.COMMON_TRANSECT}; + + /** + * All result import types. + * + * @since 1.2 + */ + protected static final ImportType[] RESULT_IMPORT_TYPES = new ImportType[]{ + ImportType.RESULT_VOYAGE, + ImportType.RESULT_ESDU, + ImportType.RESULT_REGION, + ImportType.RESULT_MAP}; + + private final String i18nKey; + + ImportType(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } + + public static ImportType[] getCommonImportType() { + return COMMON_IMPORT_TYPES; + } + + public static ImportType[] getResultImportType() { + return RESULT_IMPORT_TYPES; + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -1,5 +1,14 @@ echobase.common.driverType.h2=H2 Database echobase.common.driverType.postgres=Postgresql Database +echobase.common.importType.acoustic=Acoustic data import +echobase.common.importType.catches=Fishing data import +echobase.common.importType.commonDataAll=Voyage / Transit / Transects import +echobase.common.importType.commonDataTransect=Transects import +echobase.common.importType.operation=Operations data import +echobase.common.importType.resultsEsdu=Import the “ESDU” cells results +echobase.common.importType.resultsMap=Import the “map” cells results +echobase.common.importType.resultsRegion=Import the “region” cells results +echobase.common.importType.resultsVoyage=Import the voyage-related results echobase.config.csv.separator.description=Csv separator character echobase.config.data.directory.description=Path to application data echobase.config.documentationUrl.description=Where to find EchoBase online documentation Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -1,5 +1,14 @@ echobase.common.driverType.h2=Base H2 echobase.common.driverType.postgres=Base Postgresql +echobase.common.importType.acoustic=Import des données acoustiques +echobase.common.importType.catches=Import des données de pêche +echobase.common.importType.commonDataAll=Import Voyage / Transit / Transects +echobase.common.importType.commonDataTransect=Import Transects +echobase.common.importType.operation=Import des opérations +echobase.common.importType.resultsEsdu=Import des résultats des cellules de type «ESDU” +echobase.common.importType.resultsMap=Import des cellules de type Carte +echobase.common.importType.resultsRegion=Import des cellules de type Région +echobase.common.importType.resultsVoyage=Import des résultats du voyage echobase.config.csv.separator.description=Caractère séparateur pour les fichiers csv echobase.config.data.directory.description=Répertoire des données de l'application echobase.config.documentationUrl.description=Où trouver la documentation en ligne d'EchoBase Modified: trunk/echobase-domain/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-domain/src/main/xmi/echobase.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -25,7 +25,7 @@ model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.1 +model.tagValue.version=1.2 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true Modified: trunk/echobase-domain/src/main/xmi/echobase.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,9 +24,10 @@ package fr.ifremer.echobase.services.importdata; import com.google.common.collect.Lists; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.io.InputFile; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; @@ -50,6 +51,15 @@ /** Notes about this import to add in log book. */ protected String importNotes; + /** + * Import type. + * <p/> + * This will be saved in the ImportLog table. + * + * @since 1.2 + */ + protected ImportType importType; + /** Result stats for each file imported. (mainly kept for testing purpose). */ protected final List<CsvFileImportResult<EchoBaseEntityEnum>> importResults = Lists.newArrayList(); @@ -70,6 +80,10 @@ this.importNotes = importNotes; } + public final ImportType getImportType() { + return importType; + } + public List<CsvFileImportResult<EchoBaseEntityEnum>> getImportResults() { return importResults; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -93,10 +93,13 @@ public static final TimeLog TIME_LOG = new TimeLog(AbstractImportDataService.class); + protected String importLabel; public final String doImport(M configuration, EchoBaseUser user) throws ImportException { + importLabel = computeImportLabel(configuration); + long s0 = TimeLog.getTime(); long nbSteps = configuration.computeNbSteps(); @@ -123,6 +126,9 @@ } } + protected abstract String computeImportLabel(M configuration); + + protected String computeResultAndLogBookEntry(M configuration, EchoBaseUser user, long time) { @@ -174,7 +180,9 @@ return result; } - protected abstract String getImportLabel(); + protected final String getImportLabel() { + return importLabel; + }; protected abstract void startImport(M configuration, EchoBaseUser user) throws ImportException; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import java.util.Locale; @@ -99,6 +100,7 @@ public AcousticImportConfiguration(Locale locale) { moviesFile = InputFile.newFile(l_(locale, "echobase.common.moviesFile")); + importType = ImportType.ACOUSTIC; } public String getVoyageId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -79,8 +80,8 @@ LogFactory.getLog(AcousticImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Acoustic.getI18nKey()); + protected String computeImportLabel(AcousticImportConfiguration configuration) { + return l_(getLocale(), ImportType.ACOUSTIC.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import java.util.Locale; @@ -58,6 +59,7 @@ l_(locale, "echobase.common.subSampleFile")); biometrySampleFile = InputFile.newFile( l_(locale, "echobase.common.biometrySampleFile")); + importType = ImportType.CATCHES; } public String getVoyageId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -27,6 +27,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -77,8 +78,8 @@ LogFactory.getLog(CatchesImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Catches.getI18nKey()); + protected String computeImportLabel(CatchesImportConfiguration configuration) { + return l_(getLocale(), ImportType.CATCHES.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import java.util.Locale; @@ -39,9 +40,6 @@ private static final long serialVersionUID = 1L; - /** Selected import mode. */ - protected CommonImportMode importMode; - /** Selected mission id to use in voyage. */ protected String missionId; @@ -87,14 +85,10 @@ l_(locale, "echobase.common.transectFile")); } - public CommonImportMode getImportMode() { - return importMode; + public void setImportType(ImportType importType) { + this.importType = importType; } - public void setImportMode(CommonImportMode importMode) { - this.importMode = importMode; - } - public String getMissionId() { return missionId; } Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportMode.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportMode.java 2012-09-06 08:42:45 UTC (rev 625) @@ -1,54 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.importdata; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define common data import mode. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public enum CommonImportMode implements I18nAble { - - /** Import Voyage / Transit / Transect. */ - ALL(n_("echobase.common.commonDataImportMode.all")), - - /** Import all common data from Transect to Operation. */ - TRANSECT(n_("echobase.common.commonDataImportMode.transect")); - - private final String i18nKey; - - CommonImportMode(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } -} \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -27,7 +27,6 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Transect; @@ -40,6 +39,7 @@ import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.MissionDAO; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.importdata.csv.TransectImportModel; import fr.ifremer.echobase.services.importdata.csv.TransectImportRow; import fr.ifremer.echobase.services.importdata.csv.TransitImportModel; @@ -73,8 +73,10 @@ private static final Log log = LogFactory.getLog(CommonImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Common.getI18nKey()); + protected String computeImportLabel(CommonImportConfiguration configuration) { + String result = l_(getLocale(), + configuration.getImportType().getI18nKey()); + return result; } @Override @@ -86,9 +88,9 @@ Map<String, Vessel> vesselMap = getEntitiesMap( Vessel.class, EchoBaseFunctions.VESSEL_NAME); - switch (configuration.getImportMode()) { + switch (configuration.getImportType()) { - case ALL: { + case COMMON_ALL: { CsvFileImportResult<EchoBaseEntityEnum> importResult; @@ -102,7 +104,7 @@ configuration.addResult(importResult); } break; - case TRANSECT: { + case COMMON_TRANSECT: { CsvFileImportResult<EchoBaseEntityEnum> importResult; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ImportMode.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ImportMode.java 2012-09-06 08:42:45 UTC (rev 625) @@ -1,63 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.importdata; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define the mode of import data (says files to be imported). - * - * @author tchemit <chemit@codelutin.com> - * @since 0.2 - */ -public enum ImportMode implements I18nAble { - - /** Import Voyage / Transit / Transect. */ - Common(n_("echobase.common.importMode.common")), - - /** Import operations common data. */ - Operation(n_("echobase.common.importMode.operation")), - - /** Import catches data (unsorted, total, but no individual ones). */ - Catches(n_("echobase.common.importMode.catches")), - - /** Import accoustic data (Cells ESDU and Elementary). */ - Acoustic(n_("echobase.common.importMode.acoustic")), - - /** Import results. */ - Results(n_("echobase.common.importMode.results")); - - private final String i18nKey; - - ImportMode(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import java.util.Locale; @@ -58,6 +59,7 @@ l_(locale, "echobase.common.operationMetadataFile")); gearMetadataFile = InputFile.newFile( l_(locale, "echobase.common.gearMetadataFile")); + importType = ImportType.OPERATION; } public String getVoyageId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -25,9 +25,9 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.GearMetadataValue; import fr.ifremer.echobase.entities.data.GearMetadataValueDAO; import fr.ifremer.echobase.entities.data.Operation; @@ -42,6 +42,7 @@ import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.OperationMetadata; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.importdata.csv.GearMetadataValueImportModel; import fr.ifremer.echobase.services.importdata.csv.GearMetadataValueImportRow; import fr.ifremer.echobase.services.importdata.csv.OperationImportModel; @@ -74,8 +75,8 @@ LogFactory.getLog(OperationImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Operation.getI18nKey()); + protected String computeImportLabel(OperationImportConfiguration configuration) { + return l_(getLocale(), ImportType.OPERATION.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -25,6 +25,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -80,8 +81,8 @@ LogFactory.getLog(ResultsEsduCellImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Results.getI18nKey()); + protected String computeImportLabel(ResultsImportConfiguration configuration) { + return l_(getLocale(), ImportType.RESULT_ESDU.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportConfiguration.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import java.util.Locale; @@ -51,9 +52,6 @@ /** resultLabel to store while importing acoustic result. */ protected String resultLabel; - /** Type of import. */ - protected ResultsImportMode importMode; - /** Acoustic result by echotype import. */ protected final InputFile esduByEchotypeFile; @@ -136,14 +134,10 @@ this.dataProcessingId = dataProcessingId; } - public ResultsImportMode getImportMode() { - return importMode; + public void setImportType(ImportType importType) { + this.importType = importType; } - public void setImportMode(ResultsImportMode importMode) { - this.importMode = importMode; - } - public String getResultLabel() { return resultLabel; } Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportMode.java 2012-09-06 08:42:45 UTC (rev 625) @@ -1,61 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.importdata; - -import fr.ifremer.echobase.I18nAble; - -import static org.nuiton.i18n.I18n.n_; - -/** - * To define results import mode. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public enum ResultsImportMode implements I18nAble { - - /** Import results at voyage level. */ - VOYAGE(n_("echobase.common.resultsImportMode.voyage")), - - /** Import esdu results by echotype. */ - ESDU(n_("echobase.common.resultsImportMode.esdu")), - - /** Import cells Region. */ - REGION(n_("echobase.common.resultsImportMode.region")), - - /** Import cells Map. */ - MAP(n_("echobase.common.resultsImportMode.map")); - - - private final String i18nKey; - - ResultsImportMode(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } -} \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.DataProcessing; import fr.ifremer.echobase.entities.data.Transect; @@ -36,8 +37,6 @@ import java.util.Map; -import static org.nuiton.i18n.I18n.l_; - /** * Service to launch a "results" import. * @@ -47,35 +46,46 @@ public class ResultsImportService extends AbstractImportDataService<ResultsImportConfiguration> { @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Results.getI18nKey()); + protected String computeImportLabel(ResultsImportConfiguration configuration) { + + AbstractImportDataService<ResultsImportConfiguration> service = + getService(configuration.getImportType()); + + String result = service.computeImportLabel(configuration); + return result; } @Override public void startImport(ResultsImportConfiguration configuration, EchoBaseUser user) throws ImportException { - ResultsImportMode importMode = configuration.getImportMode(); + ImportType importMode = configuration.getImportType(); + AbstractImportDataService<ResultsImportConfiguration> service = getService(importMode); + + service.startImport(configuration, user); + } + + private AbstractImportDataService<ResultsImportConfiguration> getService(ImportType importMode) { AbstractImportDataService<ResultsImportConfiguration> service; switch (importMode) { - case VOYAGE: + case RESULT_VOYAGE: service = getService(ResultsVoyageImportService.class); break; - case ESDU: + case RESULT_ESDU: service = getService(ResultsEsduCellImportService.class); break; - case REGION: + case RESULT_REGION: service = getService(ResultsRegionCellImportService.class); break; - case MAP: + case RESULT_MAP: service = getService(ResultsMapCellImportService.class); break; @@ -83,8 +93,7 @@ throw new EchoBaseTechnicalException( "Can not treate import result of type " + importMode); } - - service.startImport(configuration, user); + return service; } public Map<String, String> getDataProcessings(Voyage voyage) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -75,8 +76,8 @@ LogFactory.getLog(ResultsMapCellImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Results.getI18nKey()); + protected String computeImportLabel(ResultsImportConfiguration configuration) { + return l_(getLocale(), ImportType.RESULT_MAP.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -79,8 +80,8 @@ LogFactory.getLog(ResultsRegionCellImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Results.getI18nKey()); + protected String computeImportLabel(ResultsImportConfiguration configuration) { + return l_(getLocale(), ImportType.RESULT_VOYAGE.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-09-06 08:42:45 UTC (rev 625) @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.EchoBaseUser; @@ -75,8 +76,8 @@ LogFactory.getLog(ResultsVoyageImportService.class); @Override - protected String getImportLabel() { - return l_(getLocale(), ImportMode.Results.getI18nKey()); + protected String computeImportLabel(ResultsImportConfiguration configuration) { + return l_(getLocale(), ImportType.RESULT_VOYAGE.getI18nKey()); } @Override Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -6,8 +6,6 @@ echobase.common.cellRegionAssociationFile=Region cells association file echobase.common.cellRegionResultFile=Region cells results file echobase.common.cellRegionsFile=Region cells file -echobase.common.commonDataImportMode.all=Voyage / Transit / Transects import -echobase.common.commonDataImportMode.transect=Transects import echobase.common.echotypeFile=Echotypes file echobase.common.esduByEchotypeAndSpeciesCategoryFile=Results per ESDU / echotype / species category file echobase.common.esduByEchotypeFile=Results per ESDU / echotype file @@ -15,20 +13,11 @@ echobase.common.esduBySpeciesAndSizeCategoryFile=Results per ESDU / species / size file echobase.common.gearMetadataFile=Gear metadata file echobase.common.importDbFile=Import file (.zip) -echobase.common.importMode.acoustic=Acoustic data import -echobase.common.importMode.catches=Fishing data import -echobase.common.importMode.common=Voyage / Transit / Transect data import -echobase.common.importMode.operation=Operations data import -echobase.common.importMode.results=Results import echobase.common.lengthAgeKeyFile=Size-age equations file echobase.common.lengthWeightKeyFile=Size-weight equations file echobase.common.moviesFile=Acoustic data file echobase.common.operationFile=Operation data file echobase.common.operationMetadataFile=Operation metadata file -echobase.common.resultsImportMode.esdu=Import the “ESDU” cells results -echobase.common.resultsImportMode.map=Import the “map” cells results -echobase.common.resultsImportMode.region=Import the “region” cells results -echobase.common.resultsImportMode.voyage=Import the voyage-related results echobase.common.subSampleFile=SubSample file echobase.common.totalSampleFile=TotalSample file echobase.common.transectFile=Transect data file Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -6,8 +6,6 @@ echobase.common.cellRegionAssociationFile=Fichier d'associations des cellules Région echobase.common.cellRegionResultFile=Fichier de résultats de cellules Région echobase.common.cellRegionsFile=Fichier des cellules Région -echobase.common.commonDataImportMode.all=Import Voyage / Transit / Transects -echobase.common.commonDataImportMode.transect=Import Transects echobase.common.echotypeFile=Fichier des échotypes echobase.common.esduByEchotypeAndSpeciesCategoryFile=Fichier de résultats par ESDU / échotype / catégorie d'espèce echobase.common.esduByEchotypeFile=Fichier de résultats par ESDU / échotype @@ -15,20 +13,11 @@ echobase.common.esduBySpeciesAndSizeCategoryFile=Fichier de résultats par ESDU / espèce / taille echobase.common.gearMetadataFile=Fichier de méta-données d'engin echobase.common.importDbFile=Fichier d'import (zip) -echobase.common.importMode.acoustic=Import des données acoustiques -echobase.common.importMode.catches=Import des données de pêche -echobase.common.importMode.common=Import des données de Voyage / Transit / Transect -echobase.common.importMode.operation=Import des opérations -echobase.common.importMode.results=Import des résultats echobase.common.lengthAgeKeyFile=Fichier des relations taille-âge echobase.common.lengthWeightKeyFile=Fichier des relations taille-poids echobase.common.moviesFile=Fichier des données acoustiques echobase.common.operationFile=Fichier des données opérations echobase.common.operationMetadataFile=Fichier des méta-données d'opérations -echobase.common.resultsImportMode.esdu=Import des résultats des cellules de type «ESDU” -echobase.common.resultsImportMode.map=Import des cellules de type Carte -echobase.common.resultsImportMode.region=Import des cellules de type Région -echobase.common.resultsImportMode.voyage=Import des résultats du voyage echobase.common.subSampleFile=Fichier d'import des sous-échantillons (“SubSample”) echobase.common.totalSampleFile=Fichier d'import des échantillons totaux (“ TotalSample”) echobase.common.transectFile=Fichier des données de transects Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/Common2ImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/Common2ImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/Common2ImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -1,85 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.importdata; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import org.junit.Test; - -import java.util.List; - -/** - * Tests {@link CommonImportService} with {@link CommonImportMode#TRANSECT} mode. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class Common2ImportServiceIT extends AbstractImportDataServiceIT { - - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_COMMON_DATA); - } - - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "common", filename}; - } - - @Test - public void doImport() throws Exception { - - // import with mode transect - - assertImportCommonData(); - - CommonImportConfiguration conf = - new CommonImportConfiguration(getLocale()); - - conf.setAreaOfOperationId(AREA_OF_OPERATION_ID); - conf.setDatum("datum"); - conf.setVoyageId(getVoyageId()); - conf.setTransectBinUnitsPingAxis("transectBinUnitsPingAxis"); - conf.setTransectGeospatialVerticalPositive("transectGeospatialVerticalPositive"); - conf.setTransectLicence("transectLicence"); - - prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); - - conf.setImportMode(CommonImportMode.TRANSECT); - - // let's delete every transects - for (Transit transit : getEntities(Transit.class)) { - transit.clearTransect(); - } - - List<CsvFileImportResult<EchoBaseEntityEnum>> result; - result = doImport(conf, CommonImportService.class, 1); - - assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT); - - assertImportCommonData(); - } - -} Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java (from rev 622, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonImportServiceIT.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -0,0 +1,92 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.importdata; + +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import org.junit.Test; +import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; + +import java.util.List; + +/** + * Tests {@link CommonImportService} with {@link ImportType#COMMON_ALL} mode. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class CommonAllImportServiceIT extends AbstractImportDataServiceIT { + + @Override + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext( + IMPORT_DATA_ECHOBASE_NO_DATA); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "common", filename}; + } + + @Test + public void doImport() throws Exception { + + // no data in db + + assertNoEntities(Voyage.class, Transit.class, Transect.class); + + // import with mode all (voyage / transit / transect) + + CommonImportConfiguration conf = + new CommonImportConfiguration(getLocale()); + + conf.setAreaOfOperationId(AREA_OF_OPERATION_ID); + conf.setDatum("datum"); + conf.setMissionId(MISSION_ID); + conf.setTransectBinUnitsPingAxis("transectBinUnitsPingAxis"); + conf.setTransectGeospatialVerticalPositive("transectGeospatialVerticalPositive"); + conf.setTransectLicence("transectLicence"); + conf.setTransitRelatedActivity("transitRelatedActivity"); + conf.setVoyageDescription("voyageDescription"); + + prepareInputFile(conf.getVoyageFile(), getImportPath("voyage.csv.gz")); + prepareInputFile(conf.getTransitFile(), getImportPath("transit.csv.gz")); + prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); + + conf.setImportType(ImportType.COMMON_ALL); + + List<CsvFileImportResult<EchoBaseEntityEnum>> result; + result = doImport(conf, CommonImportService.class, 3); + + assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE); + assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT); + assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT); + + assertImportCommonData(); + } + +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonAllImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -1,91 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.importdata; - -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; -import fr.ifremer.echobase.entities.data.Transect; -import fr.ifremer.echobase.entities.data.Transit; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import org.junit.Test; - -import java.util.List; - -/** - * Tests {@link CommonImportService} with {@link CommonImportMode#ALL} mode. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class CommonImportServiceIT extends AbstractImportDataServiceIT { - - @Override - protected FakeEchoBaseServiceContext initContext() { - return new FakeEchoBaseServiceContext( - IMPORT_DATA_ECHOBASE_NO_DATA); - } - - protected String[] getImportPath(String filename) { - return new String[]{"/import-data", "common", filename}; - } - - @Test - public void doImport() throws Exception { - - // no data in db - - assertNoEntities(Voyage.class, Transit.class, Transect.class); - - // import with mode all (voyage / transit / transect) - - CommonImportConfiguration conf = - new CommonImportConfiguration(getLocale()); - - conf.setAreaOfOperationId(AREA_OF_OPERATION_ID); - conf.setDatum("datum"); - conf.setMissionId(MISSION_ID); - conf.setTransectBinUnitsPingAxis("transectBinUnitsPingAxis"); - conf.setTransectGeospatialVerticalPositive("transectGeospatialVerticalPositive"); - conf.setTransectLicence("transectLicence"); - conf.setTransitRelatedActivity("transitRelatedActivity"); - conf.setVoyageDescription("voyageDescription"); - - prepareInputFile(conf.getVoyageFile(), getImportPath("voyage.csv.gz")); - prepareInputFile(conf.getTransitFile(), getImportPath("transit.csv.gz")); - prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); - - conf.setImportMode(CommonImportMode.ALL); - - List<CsvFileImportResult<EchoBaseEntityEnum>> result; - result = doImport(conf, CommonImportService.class, 3); - - assertCsvImportResult(result, 0, Voyage.class, NB_VOYAGE); - assertCsvImportResult(result, 1, Transit.class, NB_TRANSIT); - assertCsvImportResult(result, 2, Transect.class, NB_TRANSECT); - - assertImportCommonData(); - } - -} Copied: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java (from rev 622, trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/Common2ImportServiceIT.java) =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java (rev 0) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -0,0 +1,86 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.importdata; + +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; +import org.junit.Test; +import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; + +import java.util.List; + +/** + * Tests {@link CommonImportService} with {@link ImportType#COMMON_TRANSECT} mode. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class CommonTransectImportServiceIT extends AbstractImportDataServiceIT { + + protected FakeEchoBaseServiceContext initContext() { + return new FakeEchoBaseServiceContext(IMPORT_DATA_ECHOBASE_COMMON_DATA); + } + + protected String[] getImportPath(String filename) { + return new String[]{"/import-data", "common", filename}; + } + + @Test + public void doImport() throws Exception { + + // import with mode transect + + assertImportCommonData(); + + CommonImportConfiguration conf = + new CommonImportConfiguration(getLocale()); + + conf.setAreaOfOperationId(AREA_OF_OPERATION_ID); + conf.setDatum("datum"); + conf.setVoyageId(getVoyageId()); + conf.setTransectBinUnitsPingAxis("transectBinUnitsPingAxis"); + conf.setTransectGeospatialVerticalPositive("transectGeospatialVerticalPositive"); + conf.setTransectLicence("transectLicence"); + + prepareInputFile(conf.getTransectFile(), getImportPath("transect.csv.gz")); + + conf.setImportType(ImportType.COMMON_TRANSECT); + + // let's delete every transects + for (Transit transit : getEntities(Transit.class)) { + transit.clearTransect(); + } + + List<CsvFileImportResult<EchoBaseEntityEnum>> result; + result = doImport(conf, CommonImportService.class, 1); + + assertCsvImportResult(result, 0, Transect.class, NB_TRANSECT); + + assertImportCommonData(); + } + +} Property changes on: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CommonTransectImportServiceIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services.importdata; +import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -69,7 +70,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ESDU); + conf.setImportType(ImportType.RESULT_ESDU); InputFile inputFile = conf.getEsduByEchotypeFile(); prepareInputFile(inputFile, getImportPath("byEchotype.csv.gz")); @@ -100,7 +101,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ESDU); + conf.setImportType(ImportType.RESULT_ESDU); InputFile inputFile = conf.getEsduByEchotypeAndSpeciesCategoryFile(); prepareInputFile(inputFile, @@ -133,7 +134,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ESDU); + conf.setImportType(ImportType.RESULT_ESDU); InputFile intputFile = conf.getEsduBySpeciesAndSizeCategoryFile(); prepareInputFile(intputFile, @@ -167,7 +168,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.ESDU); + conf.setImportType(ImportType.RESULT_ESDU); InputFile inputFile = conf.getEsduBySpeciesAndAgeCategoryFile(); prepareInputFile(inputFile, Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; @@ -66,7 +67,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.MAP); + conf.setImportType(ImportType.RESULT_MAP); prepareInputFile(conf.getMapsFile(), getImportPath("maps.csv.gz")); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; @@ -67,7 +68,7 @@ conf.setResultLabel("resultLabel"); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.REGION); + conf.setImportType(ImportType.RESULT_REGION); prepareInputFile(conf.getRegionsFile(), getImportPath("regions.csv.gz")); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportServiceIT.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.ImportType; import org.nuiton.topia.persistence.csv.in.CsvFileImportResult; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.LengthAgeKey; @@ -65,7 +66,7 @@ new ResultsImportConfiguration(getLocale()); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); + conf.setImportType(ImportType.RESULT_VOYAGE); prepareInputFile(conf.getLengthAgeKeyFile(), getImportPath("lengthAgeKey.csv.gz")); @@ -95,7 +96,7 @@ new ResultsImportConfiguration(getLocale()); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); + conf.setImportType(ImportType.RESULT_VOYAGE); prepareInputFile(conf.getLengthAgeKeyFile(), getImportPath("lengthAgeKey.csv.gz")); @@ -120,7 +121,7 @@ new ResultsImportConfiguration(getLocale()); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); + conf.setImportType(ImportType.RESULT_VOYAGE); prepareInputFile(conf.getLengthWeightKeyFile(), getImportPath("lengthWeightKey.csv.gz")); @@ -145,7 +146,7 @@ new ResultsImportConfiguration(getLocale()); conf.setVoyageId(getVoyageId()); - conf.setImportMode(ResultsImportMode.VOYAGE); + conf.setImportType(ImportType.RESULT_VOYAGE); prepareInputFile(conf.getEchotypeFile(), getImportPath("echotype.csv.gz")); Modified: trunk/echobase-services/update-import-data-db.sh =================================================================== --- trunk/echobase-services/update-import-data-db.sh 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-services/update-import-data-db.sh 2012-09-06 08:42:45 UTC (rev 625) @@ -38,7 +38,7 @@ executeMaven fr.ifremer.echobase.services.ImportDbServiceTest nodata -executeMaven fr.ifremer.echobase.services.importdata.CommonImportServiceIT commonData +executeMaven fr.ifremer.echobase.services.importdata.CommonAllImportServiceIT commonData executeMaven fr.ifremer.echobase.services.importdata.OperationImportServiceIT operation Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,11 +24,11 @@ package fr.ifremer.echobase.ui.actions.importData; 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.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.services.importdata.CommonImportConfiguration; -import fr.ifremer.echobase.services.importdata.CommonImportMode; import java.io.File; import java.util.Map; @@ -53,7 +53,7 @@ protected Map<String, String> areaOfOperations; /** Universe of possible import modes. */ - protected Map<String, String> importModes; + protected Map<String, String> importTypes; public ConfigureCommonImport() { super(CommonImportConfiguration.class); @@ -69,11 +69,11 @@ missions = loadSortAndDecorate(Mission.class); voyages = loadSortAndDecorate(Voyage.class); areaOfOperations = loadSortAndDecorate(AreaOfOperation.class); - importModes = decorateEnums(CommonImportMode.values()); + importTypes = decorateEnums(ImportType.getCommonImportType()); - if (model.getImportMode() == null) { + if (model.getImportType() == null) { - model.setImportMode(CommonImportMode.ALL); + model.setImportType(ImportType.COMMON_ALL); } } @@ -101,8 +101,8 @@ return areaOfOperations; } - public Map<String, String> getImportModes() { - return importModes; + public Map<String, String> getImportTypes() { + return importTypes; } public void setVoyageFile(File file) { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2012-09-06 08:42:45 UTC (rev 625) @@ -24,10 +24,10 @@ package fr.ifremer.echobase.ui.actions.importData; 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.importdata.ResultsImportConfiguration; -import fr.ifremer.echobase.services.importdata.ResultsImportMode; import java.io.File; import java.util.Map; @@ -49,7 +49,7 @@ protected Map<String, String> vessels; /** Universe of possible import modes. */ - protected Map<String, String> importModes; + protected Map<String, String> importTypes; protected String resultLabel; @@ -66,11 +66,11 @@ protected void prepareInputAction(ResultsImportConfiguration model) { voyages = loadSortAndDecorate(Voyage.class); vessels = loadSortAndDecorate(Vessel.class); - importModes = decorateEnums(ResultsImportMode.values()); + importTypes = decorateEnums(ImportType.getResultImportType()); - if (model.getImportMode() == null) { + if (model.getImportType() == null) { - model.setImportMode(ResultsImportMode.VOYAGE); + model.setImportType(ImportType.RESULT_VOYAGE); } } @@ -106,8 +106,8 @@ return vessels; } - public Map<String, String> getImportModes() { - return importModes; + public Map<String, String> getImportTypes() { + return importTypes; } Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java (from rev 622, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ImportMode.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2012-09-06 08:42:45 UTC (rev 625) @@ -0,0 +1,64 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.ui.actions.importData; + +import fr.ifremer.echobase.I18nAble; +import fr.ifremer.echobase.entities.ImportType; + +import static org.nuiton.i18n.I18n.n_; + +/** + * To define the mode of import data (says files to be imported). + * + * @author tchemit <chemit@codelutin.com> + * @since 0.2 + */ +public enum ImportMode implements I18nAble { + + /** Import Voyage / Transit / Transect. */ + Common(n_("echobase.common.importType.common")), + + /** Import operations common data. */ + Operation(ImportType.OPERATION.getI18nKey()), + + /** Import catches data (unsorted, total, but no individual ones). */ + Catches(ImportType.CATCHES.getI18nKey()), + + /** Import accoustic data (Cells ESDU and Elementary). */ + Acoustic(ImportType.ACOUSTIC.getI18nKey()), + + /** Import results. */ + Results(n_("echobase.common.importType.results")); + + private final String i18nKey; + + ImportMode(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java 2012-09-06 08:42:45 UTC (rev 625) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.ui.actions.importData; -import fr.ifremer.echobase.services.importdata.ImportMode; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.util.Map; @@ -44,7 +43,6 @@ protected Map<String, String> modes; public Map<String, String> getModes() { - return modes; } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -71,12 +71,9 @@ echobase.common.importDataMode=Import type echobase.common.importDbFile= echobase.common.importError=Error\: -echobase.common.importMode=Import type -echobase.common.importMode.acoustic= -echobase.common.importMode.catches= -echobase.common.importMode.common= -echobase.common.importMode.operation= -echobase.common.importMode.results= +echobase.common.importType=Import type +echobase.common.importType.common=Voyage / Transit / Transect data import +echobase.common.importType.results=Results import echobase.common.importNotes=Import notes echobase.common.importResult=Import results echobase.common.inProgress=Processing... Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-06 08:42:45 UTC (rev 625) @@ -71,12 +71,9 @@ echobase.common.importDataMode=Type d'import echobase.common.importDbFile= echobase.common.importError=Une erreur est survenue pendant l'import \: -echobase.common.importMode=Type d'import -echobase.common.importMode.acoustic= -echobase.common.importMode.catches= -echobase.common.importMode.common= -echobase.common.importMode.operation= -echobase.common.importMode.results= +echobase.common.importType=Type d'import +echobase.common.importType.common=Import des données de Voyage / Transit / Transect +echobase.common.importType.results=Import des résultats echobase.common.importNotes=Remarques sur l'import echobase.common.importResult=Résultat de l'import echobase.common.inProgress=En cours... Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <title> - Configuration <s:text name="echobase.common.importMode.acoustic"/> + Configuration <s:text name="echobase.common.importType.acoustic"/> </title> <script type="text/javascript" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -28,7 +28,7 @@ src="<s:url value='/js/gridHelper.js' />"></script> <title> - Configuration <s:text name="echobase.common.importMode.catches"/> + Configuration <s:text name="echobase.common.importType.catches"/> </title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -25,34 +25,34 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <title> - Configuration <s:text name="echobase.common.importMode.common"/> + Configuration <s:text name="echobase.common.importType.common"/> </title> <script type="text/javascript"> jQuery(document).ready(function () { - $('[name="model.importMode"]').change(function (event) { + $('[name="model.importTtype"]').change(function (event) { $('[class~="importMode"]').hide(); $('#' + this.value).show(); $('#' + this.value + ' .errorMessage').hide(); }); - var incomingVal = $('[name="model.importMode"][checked="checked"]').val(); + var incomingVal = $('[name="model.importTtype"][checked="checked"]').val(); $('#' + incomingVal).show(); }); </script> -<s:radio id='mode' key='model.importMode' list="importModes" - cssClass="cleanBoth" label='%{getText("echobase.common.importMode")}' +<s:radio id='mode' key='model.importTtype' list="importTypes" + cssClass="cleanBoth" label='%{getText("echobase.common.importType")}' required="true" template="myradiomap"/> <hr/> -<%--Import mode = ALL--%> +<%--Import mode = COMMON_ALL--%> -<s:form id="ALL" namespace="/importData" method="POST" +<s:form id="COMMON_ALL" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -73,7 +73,7 @@ list="missions" headerKey="" headerValue=""/> <br/> - <s:hidden key="model.importMode" value="ALL" label=''/> + <s:hidden key="model.importTtype" value="COMMON_ALL" label=''/> <s:select key="model.areaOfOperationId" required="true" label='%{getText("echobase.common.areaOfOperation")}' @@ -117,9 +117,9 @@ </s:form> -<%--Import mode = TRANSECT --%> +<%--Import mode = COMMON_TRANSECT --%> -<s:form id='TRANSECT' namespace="/importData" method="POST" +<s:form id='COMMON_TRANSECT' namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -127,7 +127,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importMode" value="TRANSECT" label=''/> + <s:hidden key="model.importTtype" value="COMMON_TRANSECT" label=''/> <div class="cleanBoth help"> <s:a href="%{getDocumentation('imports.html','voyage-transit-transect')}" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -28,7 +28,7 @@ src="<s:url value='/js/gridHelper.js' />"></script> <title> - Configuration <s:text name="echobase.common.importMode.operation"/> + Configuration <s:text name="echobase.common.importType.operation"/> </title> <s:form namespace="/importData" method="POST" enctype="multipart/form-data"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <title> - Configuration <s:text name="echobase.common.importMode.results"/> + Configuration <s:text name="echobase.common.importType.results"/> </title> <script type="text/javascript" @@ -36,14 +36,14 @@ jQuery(document).ready(function () { // to change form when mode is changed - $('[name="model.importMode"]').change(function (event) { + $('[name="model.importType"]').change(function (event) { $('[class~="importMode"]').hide(); $('#' + this.value).show(); $('#' + this.value + ' .errorMessage').hide(); }); // show incoming mode - var incomingVal = $('[name="model.importMode"][checked="checked"]').val(); + var incomingVal = $('[name="model.importType"][checked="checked"]').val(); $('#' + incomingVal).show(); $.autoSelectVoyageAndDataProcessing( @@ -56,12 +56,11 @@ }); </script> -<s:radio id='mode' key='model.importMode' list="importModes" - cssClass="cleanBoth" - label='%{getText("echobase.common.importMode")}' - required="true" template="myradiomap"/> +<s:radio id='mode' key='model.importType' list="importTypes" + cssClass="cleanBoth" required="true" template="myradiomap" + label='%{getText("echobase.common.importType")}' /> -<s:form id="VOYAGE" namespace="/importData" method="POST" +<s:form id="RESULT_VOYAGE" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -77,7 +76,7 @@ </div> <br/> - <s:hidden key="model.importMode" value="VOYAGE" label=''/> + <s:hidden key="model.importType" value="RESULT_VOYAGE" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -102,7 +101,7 @@ <s:submit action="configureResults-modeVoyage" key='echobase.action.import'/> </s:form> -<s:form id="ESDU" namespace="/importData" method="POST" +<s:form id="RESULT_ESDU" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -118,7 +117,7 @@ </div> <br/> - <s:hidden key="model.importMode" value="ESDU" label=''/> + <s:hidden key="model.importType" value="RESULT_ESDU" label=''/> <s:select id='voyageSelectBox' key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -153,7 +152,7 @@ <s:submit action="configureResults-modeEsdu" key='echobase.action.import'/> </s:form> -<s:form id="REGION" namespace="/importData" method="POST" +<s:form id="RESULT_REGION" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -168,7 +167,7 @@ </div> <br/> - <s:hidden key="model.importMode" value="REGION" label=''/> + <s:hidden key="model.importType" value="RESULT_REGION" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' @@ -193,7 +192,7 @@ <s:submit action="configureResults-modeRegion" key='echobase.action.import'/> </s:form> -<s:form id="MAP" namespace="/importData" method="POST" +<s:form id="RESULT_MAP" namespace="/importData" method="POST" enctype="multipart/form-data" cssClass="hidden importMode"> <fieldset> @@ -208,7 +207,7 @@ </div> <br/> - <s:hidden key="model.importMode" value="MAP" label=''/> + <s:hidden key="model.importType" value="RESULT_MAP" label=''/> <s:select key="model.voyageId" required="true" label='%{getText("echobase.common.voyage")}' Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ <meta http-equiv="refresh" content="1;url=${url}"/> <title> - <s:text name="echobase.common.importMode.acoustic"/> + <s:text name="echobase.common.importType.acoustic"/> <s:text name="echobase.common.inProgress"/> </title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ <meta http-equiv="refresh" content="1;url=${url}"/> <title> - <s:text name="echobase.common.importMode.catches"/> + <s:text name="echobase.common.importType.catches"/> <s:text name="echobase.common.inProgress"/> </title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ <meta http-equiv="refresh" content="1;url=${url}"/> <title> - <s:text name="echobase.common.importMode.common"/> + <s:text name="echobase.common.importType.common"/> <s:text name="echobase.common.inProgress"/> </title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressOperationImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ <meta http-equiv="refresh" content="1;url=${url}"/> <title> - <s:text name="echobase.common.importMode.operation"/> + <s:text name="echobase.common.importType.operation"/> <s:text name="echobase.common.inProgress"/> </title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressResultsImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ <meta http-equiv="refresh" content="1;url=${url}"/> <title> - <s:text name="echobase.common.importMode.results"/> + <s:text name="echobase.common.importType.results"/> <s:text name="echobase.common.inProgress"/> </title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAcousticImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -26,7 +26,7 @@ <title> <s:text name="echobase.common.importResult"/> - <s:text name="echobase.common.importMode.acoustic"/> + <s:text name="echobase.common.importType.acoustic"/> </title> <%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -26,7 +26,7 @@ <title> <s:text name="echobase.common.importResult"/> - <s:text name="echobase.common.importMode.catches"/> + <s:text name="echobase.common.importType.catches"/> </title> <%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <title> - <s:text name="echobase.common.importMode.common"/> + <s:text name="echobase.common.importType.common"/> </title> <%@ include file="/WEB-INF/includes/importDataResults.jsp" %> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperationImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -26,7 +26,7 @@ <title> <s:text name="echobase.common.importResult"/> - <s:text name="echobase.common.importMode.operation"/> + <s:text name="echobase.common.importType.operation"/> </title> <%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp 2012-09-05 16:06:11 UTC (rev 624) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResultsImport.jsp 2012-09-06 08:42:45 UTC (rev 625) @@ -29,7 +29,7 @@ </title> <h4> - <s:text name="echobase.common.importMode.results"/> + <s:text name="echobase.common.importType.results"/> ( <s:property value="%{getText(model.importMode.i18nKey)}"/> ) </h4>