Author: tchemit Date: 2012-09-10 18:00:37 +0200 (Mon, 10 Sep 2012) New Revision: 643 Url: http://forge.codelutin.com/repositories/revision/echobase/643 Log: refs #1485: Permettre une import EchoBase plus cibl?\195?\169 Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 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-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2012-09-10 16:00:37 UTC (rev 643) @@ -35,8 +35,8 @@ */ public enum ImportType implements I18nAble { - /** Import a legacy Voyage with all his data. */ - LEGACY_VOYAGE(n_("echobase.common.importType.legacyVoyage")), + /** Import a voyage with all his data. */ + VOYAGE(n_("echobase.common.importType.voyage")), /** Import Voyage / Transit / Transect. */ COMMON_ALL(n_("echobase.common.importType.commonDataAll")), 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-10 14:18:37 UTC (rev 642) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2012-09-10 16:00:37 UTC (rev 643) @@ -4,7 +4,7 @@ echobase.common.importType.catches=Fishing data import echobase.common.importType.commonDataAll=Voyage / Transit / Transects import echobase.common.importType.commonDataTransect=Transects import -echobase.common.importType.legacyVoyage=Legacy voyage import +echobase.common.importType.voyage=Voyage 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 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-10 14:18:37 UTC (rev 642) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties 2012-09-10 16:00:37 UTC (rev 643) @@ -4,7 +4,7 @@ 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.legacyVoyage=Import Campagne "ancienne" +echobase.common.importType.voyage=Import Campagne 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 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbMode.java 2012-09-10 16:00:37 UTC (rev 643) @@ -40,7 +40,7 @@ REFERENTIAL(n_("echobase.common.importDbMode.referential")), /** Import only data. */ - LEGACY_VOYAGE(ImportType.LEGACY_VOYAGE.getI18nKey()), + VOYAGE(ImportType.VOYAGE.getI18nKey()), /** Import what you want. */ FREE(n_("echobase.common.importDbMode.free")); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportDbService.java 2012-09-10 16:00:37 UTC (rev 643) @@ -266,10 +266,10 @@ // create a importLog entry ImportLog importLog = importLogDAO.create( - ImportLog.PROPERTY_IMPORT_TYPE, ImportType.LEGACY_VOYAGE, + ImportLog.PROPERTY_IMPORT_TYPE, ImportType.VOYAGE, ImportLog.PROPERTY_IMPORT_USER, user.getEmail(), ImportLog.PROPERTY_IMPORT_DATE, newDate(), - ImportLog.PROPERTY_IMPORT_TYPE, "import legacy voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() + ImportLog.PROPERTY_IMPORT_TEXT, "import legacy voyage " + decorator.toString(importedVoyage) + " from file " + file.getName() ); importLog.addImportId(importedVoyage.getTopiaId()); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2012-09-10 16:00:37 UTC (rev 643) @@ -75,7 +75,7 @@ public static Class<? extends AbstractRemoveDataStrategy> getStrategy(ImportType importType) { if (strategies == null) { strategies = Maps.newEnumMap(ImportType.class); - strategies.put(ImportType.LEGACY_VOYAGE, LegacyVoyageRemoveDataStrategy.class); + strategies.put(ImportType.VOYAGE, LegacyVoyageRemoveDataStrategy.class); strategies.put(ImportType.COMMON_ALL, CommonAllRemoveDataStrategy.class); strategies.put(ImportType.COMMON_TRANSECT, CommonTransectRemoveDataStrategy.class); strategies.put(ImportType.OPERATION, OperationRemoveDataStrategy.class); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-10 16:00:37 UTC (rev 643) @@ -34,7 +34,7 @@ import java.util.Set; /** - * Remove a {@link ImportType#LEGACY_VOYAGE} import. + * Remove a {@link ImportType#VOYAGE} import. * <p/> * Can remove only {@link Voyage}. * Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-09-10 16:00:37 UTC (rev 643) @@ -98,7 +98,7 @@ return execute(); } - public String execute_legacyVoyage() throws Exception { + public String execute_voyage() throws Exception { return execute(); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-09-10 16:00:37 UTC (rev 643) @@ -79,7 +79,7 @@ model.getActionTime()); break; - case LEGACY_VOYAGE: + case VOYAGE: service.importLegacyData(model, user); addFlashMessage(_("echobase.info.import.succeded")); Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-09-10 16:00:37 UTC (rev 643) @@ -84,7 +84,7 @@ value='%{getText("echobase.action.import")}'/> </s:form> -<s:form id="LEGACY_VOYAGE" namespace="/importDb" method="POST" +<s:form id="VOYAGE" namespace="/importDb" method="POST" enctype="multipart/form-data" cssClass="hidden importDbMode"> <fieldset> @@ -93,20 +93,20 @@ </legend> <div class="cleanBoth help"> - <s:a href="%{getDocumentation('importDb.html','legacy-voyage')}" + <s:a href="%{getDocumentation('importDb.html','voyage')}" target="doc"> <s:text name="echobase.action.show.importDb.documentation"/> </s:a> </div> <br/> - <s:hidden key="model.importDbMode" value="LEGACY_VOYAGE" label=''/> + <s:hidden key="model.importDbMode" value="VOYAGE" label=''/> <s:file name="input" required="true" key="echobase.common.importDbFile"/> </fieldset> <br/> - <s:submit action="configure-legacyVoyage" + <s:submit action="configure-voyage" value='%{getText("echobase.action.import")}'/> </s:form> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2012-09-10 14:18:37 UTC (rev 642) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/progress.jsp 2012-09-10 16:00:37 UTC (rev 643) @@ -25,8 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="import" namespace="/importDb"/> -<meta http-equiv="refresh" content="10;url=${url}"/> +<meta http-equiv="refresh" content="10;url=<s:url action="import" namespace="/importDb"/>"/> <title><s:text name="echobase.title.importDbProgress"/></title>