Author: tchemit Date: 2012-01-12 13:02:13 +0100 (Thu, 12 Jan 2012) New Revision: 259 Url: http://forge.codelutin.com/repositories/revision/echobase/259 Log: use I18nAble + create mission code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataMode.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-12 12:00:25 UTC (rev 258) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-12 12:02:13 UTC (rev 259) @@ -24,9 +24,12 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; +import org.nuiton.topia.TopiaException; import java.util.Map; @@ -47,6 +50,17 @@ return result; } + public Mission createMission(Mission mission) { + try { + Mission result = getDAO(Mission.class).create(mission); + commitTransaction("Could not create mission " + + mission.getName()); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(eee); + } + } + private void importCasinoFile(InputFile casinoFile, char csvSeparator) { } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataMode.java 2012-01-12 12:00:25 UTC (rev 258) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataMode.java 2012-01-12 12:02:13 UTC (rev 259) @@ -23,6 +23,8 @@ */ package fr.ifremer.echobase.services; +import fr.ifremer.echobase.I18nAble; + import static org.nuiton.i18n.I18n.n_; /** @@ -31,7 +33,7 @@ * @author tchemit <chemit@codelutin.com> * @since 0.2 */ -public enum ImportDataMode { +public enum ImportDataMode implements I18nAble { /** Import all common data from Voyage to Operation. */ CommonDataComplete(n_("echobase.common.importDataMode.commonDataComplete")), @@ -60,6 +62,7 @@ this.i18nKey = i18nKey; } + @Override public String getI18nKey() { return i18nKey; } 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-01-12 12:00:25 UTC (rev 258) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/SelectImportType.java 2012-01-12 12:02:13 UTC (rev 259) @@ -23,7 +23,6 @@ */ package fr.ifremer.echobase.ui.actions.importData; -import com.google.common.collect.Maps; import fr.ifremer.echobase.services.ImportDataMode; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; @@ -57,13 +56,9 @@ this.mode = mode; } - @Override public String input() throws Exception { - modes = Maps.newLinkedHashMap(); - for (SelectedMissionMode mode : SelectedMissionMode.values()) { - modes.put(mode.name(), _(mode.getI18nKey())); - } + modes = decorateEnums(ImportDataMode.values()); if (mode == null) { mode = ImportDataMode.CommonDataComplete;