Author: tchemit Date: 2012-01-15 23:12:51 +0100 (Sun, 15 Jan 2012) New Revision: 285 Url: http://forge.codelutin.com/repositories/revision/echobase/285 Log: rename import data actions make import data configure validation ok improve i18n for import data Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,92 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureAccousticData extends AbstractConfigureImport<AccousticDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureAccousticData() { + super(AccousticDataImportConfiguration.class); + } + + @Override + protected AccousticDataImportConfiguration createModel() { + return new AccousticDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public void setMoviesFile(File file) { + getModel().getMoviesFile().setFile(file); + } + + public void setMoviesFileContentType(String contentType) { + getModel().getMoviesFile().setContentType(contentType); + } + + public void setMoviesFileFileName(String fileName) { + getModel().getMoviesFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,92 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureAccousticDataImport extends AbstractConfigureImport<AccousticDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureAccousticDataImport() { - super(AccousticDataImportConfiguration.class); - } - - @Override - protected AccousticDataImportConfiguration createModel() { - return new AccousticDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public void setMoviesFile(File file) { - getModel().getMoviesFile().setFile(file); - } - - public void setMoviesFileContentType(String contentType) { - getModel().getMoviesFile().setContentType(contentType); - } - - public void setMoviesFileFileName(String fileName) { - getModel().getMoviesFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,104 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "accoustic region data" import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureAccousticRegionData extends AbstractConfigureImport<AccousticRegionDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureAccousticRegionData() { + super(AccousticRegionDataImportConfiguration.class); + } + + @Override + protected AccousticRegionDataImportConfiguration createModel() { + return new AccousticRegionDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public void setRegionsFile(File file) { + getModel().getRegionsFile().setFile(file); + } + + public void setRegionsFileContentType(String contentType) { + getModel().getRegionsFile().setContentType(contentType); + } + + public void setRegionsFileFileName(String fileName) { + getModel().getRegionsFile().setFileName(fileName); + } + + public void setAssociationFile(File file) { + getModel().getAssociationFile().setFile(file); + } + + public void setAssociationFileContentType(String contentType) { + getModel().getAssociationFile().setContentType(contentType); + } + + public void setAssociationFileFileName(String fileName) { + getModel().getAssociationFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,104 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "accoustic region data" import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureAccousticRegionDataImport extends AbstractConfigureImport<AccousticRegionDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureAccousticRegionDataImport() { - super(AccousticRegionDataImportConfiguration.class); - } - - @Override - protected AccousticRegionDataImportConfiguration createModel() { - return new AccousticRegionDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public void setRegionsFile(File file) { - getModel().getRegionsFile().setFile(file); - } - - public void setRegionsFileContentType(String contentType) { - getModel().getRegionsFile().setContentType(contentType); - } - - public void setRegionsFileFileName(String fileName) { - getModel().getRegionsFile().setFileName(fileName); - } - - public void setAssociationFile(File file) { - getModel().getAssociationFile().setFile(file); - } - - public void setAssociationFileContentType(String contentType) { - getModel().getAssociationFile().setContentType(contentType); - } - - public void setAssociationFileFileName(String fileName) { - getModel().getAssociationFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,119 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "catches data" import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesData extends AbstractConfigureImport<CatchesDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public ConfigureCatchesData() { + super(CatchesDataImportConfiguration.class); + } + + @Override + protected CatchesDataImportConfiguration createModel() { + return new CatchesDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setTlbeStationFile(File file) { + getModel().getTlbeStationFile().setFile(file); + } + + public void setTlbeStationFileContentType(String contentType) { + getModel().getTlbeStationFile().setContentType(contentType); + } + + public void setTlbeStationFileFileName(String fileName) { + getModel().getTlbeStationFile().setFileName(fileName); + } + + public void setXtblTriFile(File file) { + getModel().getXtblTriFile().setFile(file); + } + + public void setXtblTriFileContentType(String contentType) { + getModel().getXtblTriFile().setContentType(contentType); + } + + public void setXtblTriFileFileName(String fileName) { + getModel().getXtblTriFile().setFileName(fileName); + } + + public void setTblMensurationFile(File file) { + getModel().getTblMensurationFile().setFile(file); + } + + public void setTblMensurationFileContentType(String contentType) { + getModel().getTblMensurationFile().setContentType(contentType); + } + + public void setTblMensurationFileFileName(String fileName) { + getModel().getTblMensurationFile().setFileName(fileName); + } + + public void setTblMensurationClasseFile(File file) { + getModel().getTblMensurationClasseFile().setFile(file); + } + + public void setTblMensurationClasseFileContentType(String contentType) { + getModel().getTblMensurationClasseFile().setContentType(contentType); + } + + public void setTblMensurationClasseFileFileName(String fileName) { + getModel().getTblMensurationClasseFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,119 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "catches data" import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesDataImport extends AbstractConfigureImport<CatchesDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - public ConfigureCatchesDataImport() { - super(CatchesDataImportConfiguration.class); - } - - @Override - protected CatchesDataImportConfiguration createModel() { - return new CatchesDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public void setTlbeStationFile(File file) { - getModel().getTlbeStationFile().setFile(file); - } - - public void setTlbeStationFileContentType(String contentType) { - getModel().getTlbeStationFile().setContentType(contentType); - } - - public void setTlbeStationFileFileName(String fileName) { - getModel().getTlbeStationFile().setFileName(fileName); - } - - public void setXtblTriFile(File file) { - getModel().getXtblTriFile().setFile(file); - } - - public void setXtblTriFileContentType(String contentType) { - getModel().getXtblTriFile().setContentType(contentType); - } - - public void setXtblTriFileFileName(String fileName) { - getModel().getXtblTriFile().setFileName(fileName); - } - - public void setTblMensurationFile(File file) { - getModel().getTblMensurationFile().setFile(file); - } - - public void setTblMensurationFileContentType(String contentType) { - getModel().getTblMensurationFile().setContentType(contentType); - } - - public void setTblMensurationFileFileName(String fileName) { - getModel().getTblMensurationFile().setFileName(fileName); - } - - public void setTblMensurationClasseFile(File file) { - getModel().getTblMensurationClasseFile().setFile(file); - } - - public void setTblMensurationClasseFileContentType(String contentType) { - getModel().getTblMensurationClasseFile().setContentType(contentType); - } - - public void setTblMensurationClasseFileFileName(String fileName) { - getModel().getTblMensurationClasseFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,83 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "catches individual data" import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesIndividualData extends AbstractConfigureImport<CatchesIndividualDataImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public ConfigureCatchesIndividualData() { + super(CatchesIndividualDataImportConfiguration.class); + } + + @Override + protected CatchesIndividualDataImportConfiguration createModel() { + return new CatchesIndividualDataImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public void setIndividualDataFile(File file) { + getModel().getIndividualDataFile().setFile(file); + } + + public void setIndividualDataFileContentType(String contentType) { + getModel().getIndividualDataFile().setContentType(contentType); + } + + public void setIndividualDataFileFileName(String fileName) { + getModel().getIndividualDataFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,83 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "catches individual data" import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesIndividualDataImport extends AbstractConfigureImport<CatchesIndividualDataImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - public ConfigureCatchesIndividualDataImport() { - super(CatchesIndividualDataImportConfiguration.class); - } - - @Override - protected CatchesIndividualDataImportConfiguration createModel() { - return new CatchesIndividualDataImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public void setIndividualDataFile(File file) { - getModel().getIndividualDataFile().setFile(file); - } - - public void setIndividualDataFileContentType(String contentType) { - getModel().getIndividualDataFile().setContentType(contentType); - } - - public void setIndividualDataFileFileName(String fileName) { - getModel().getIndividualDataFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,72 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; + +import java.io.File; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureCatchesReference extends AbstractConfigureImport<CatchesReferenceImportConfiguration> { + + private static final long serialVersionUID = 1L; + + public ConfigureCatchesReference() { + super(CatchesReferenceImportConfiguration.class); + } + + @Override + protected CatchesReferenceImportConfiguration createModel() { + return new CatchesReferenceImportConfiguration(getLocale()); + } + + public void setLengthAgeKeyFile(File file) { + getModel().getLengthAgeKeyFile().setFile(file); + } + + public void setLengthAgeKeyFileContentType(String contentType) { + getModel().getLengthAgeKeyFile().setContentType(contentType); + } + + public void setLengthAgeKeyFileFileName(String fileName) { + getModel().getLengthAgeKeyFile().setFileName(fileName); + } + + public void setLengthWeightKeyFile(File file) { + getModel().getLengthWeightKeyFile().setFile(file); + } + + public void setLengthWeightKeyFileContentType(String contentType) { + getModel().getLengthWeightKeyFile().setContentType(contentType); + } + + public void setLengthWeightKeyFileFileName(String fileName) { + getModel().getLengthWeightKeyFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReferenceImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,72 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; - -import java.io.File; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureCatchesReferenceImport extends AbstractConfigureImport<CatchesReferenceImportConfiguration> { - - private static final long serialVersionUID = 1L; - - public ConfigureCatchesReferenceImport() { - super(CatchesReferenceImportConfiguration.class); - } - - @Override - protected CatchesReferenceImportConfiguration createModel() { - return new CatchesReferenceImportConfiguration(getLocale()); - } - - public void setLengthAgeKeyFileFile(File file) { - getModel().getLengthAgeKeyFile().setFile(file); - } - - public void setLengthAgeKeyFileContentType(String contentType) { - getModel().getLengthAgeKeyFile().setContentType(contentType); - } - - public void setLengthAgeKeyFileFileName(String fileName) { - getModel().getLengthAgeKeyFile().setFileName(fileName); - } - - public void setLengthWeightKeyFileFile(File file) { - getModel().getLengthWeightKeyFile().setFile(file); - } - - public void setLengthWeightKeyFileContentType(String contentType) { - getModel().getLengthWeightKeyFile().setContentType(contentType); - } - - public void setLengthWeightKeyFileFileName(String fileName) { - getModel().getLengthWeightKeyFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java (from rev 284, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,196 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import fr.ifremer.echobase.entities.references.AreaOfOperation; +import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.entities.references.MissionImpl; +import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.services.CommonDataCompleteImportService; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureCommonDataComplete extends AbstractConfigureImport<CommonDataCompleteImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing missions. */ + protected Map<String, String> missions; + + /** Universe of existing area of operations. */ + protected Map<String, String> areaOfOperations; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + /** Universe of possible import modes. */ + protected Map<String, String> importModes; + + /** Selected import mode. */ + protected SelectedMissionMode importMode; + + /** mission to create (if asked to create a new mission). */ + protected Mission mission; + + public ConfigureCommonDataComplete() { + super(CommonDataCompleteImportConfiguration.class); + } + + @Override + protected CommonDataCompleteImportConfiguration createModel() { + return new CommonDataCompleteImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + missions = loadSortAndDecorate(service, Mission.class); + areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + importModes = decorateEnums(SelectedMissionMode.values()); + + if (importMode == null) { + importMode = SelectedMissionMode.USE_EXISTING_MISSION; + } + + return INPUT; + } + + @InputConfig(methodName = "input") + @Override + public String execute() throws Exception { + + super.execute(); + + if (importMode == SelectedMissionMode.CREATE_NEW_MISSION) { + + // create voyage in db + CommonDataCompleteImportService service = + newService(CommonDataCompleteImportService.class); + + Mission missionToCreate = getMission(); + + Mission missionSaved = service.createMission(missionToCreate); + + getModel().setMissionId(missionSaved.getTopiaId()); + } + + return SUCCESS; + } + + public Map<String, String> getMissions() { + return missions; + } + + public Map<String, String> getAreaOfOperations() { + return areaOfOperations; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public Map<String, String> getImportModes() { + return importModes; + } + + public SelectedMissionMode getImportMode() { + return importMode; + } + + public Mission getMission() { + if (mission == null) { + mission = new MissionImpl(); + } + return mission; + } + + public void setImportMode(SelectedMissionMode importMode) { + this.importMode = importMode; + } + + public void setVoyageFile(File file) { + getModel().getVoyageFile().setFile(file); + } + + public void setVoyageFileContentType(String contentType) { + getModel().getVoyageFile().setContentType(contentType); + } + + public void setVoyageFileFileName(String fileName) { + getModel().getVoyageFile().setFileName(fileName); + } + + public void setTransitFile(File file) { + getModel().getTransitFile().setFile(file); + } + + public void setTransitFileContentType(String contentType) { + getModel().getTransitFile().setContentType(contentType); + } + + public void setTransitFileFileName(String fileName) { + getModel().getTransitFile().setFileName(fileName); + } + + public void setTransectFile(File file) { + getModel().getTransectFile().setFile(file); + } + + public void setTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); + } + + public void setTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } + + public void setEchotypeFile(File file) { + getModel().getEchotypeFile().setFile(file); + } + + public void setEchotypeFileContentType(String contentType) { + getModel().getEchotypeFile().setContentType(contentType); + } + + public void setEchotypeFileFileName(String fileName) { + getModel().getEchotypeFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataCompleteImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,194 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.references.AreaOfOperation; -import fr.ifremer.echobase.entities.references.Mission; -import fr.ifremer.echobase.entities.references.MissionImpl; -import fr.ifremer.echobase.entities.references.Vessel; -import fr.ifremer.echobase.services.CommonDataCompleteImportService; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureCommonDataCompleteImport extends AbstractConfigureImport<CommonDataCompleteImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing missions. */ - protected Map<String, String> missions; - - /** Universe of existing area of operations. */ - protected Map<String, String> areaOfOperations; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - /** Universe of possible import modes. */ - protected Map<String, String> importModes; - - /** Selected import mode. */ - protected SelectedMissionMode importMode; - - /** mission to create (if asked to create a new mission). */ - protected Mission mission; - - public ConfigureCommonDataCompleteImport() { - super(CommonDataCompleteImportConfiguration.class); - } - - @Override - protected CommonDataCompleteImportConfiguration createModel() { - return new CommonDataCompleteImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - missions = loadSortAndDecorate(service, Mission.class); - areaOfOperations = loadSortAndDecorate(service, AreaOfOperation.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - importModes = decorateEnums(SelectedMissionMode.values()); - - if (importMode == null) { - importMode = SelectedMissionMode.USE_EXISTING_MISSION; - } - - return INPUT; - } - - @Override - public String execute() throws Exception { - - super.execute(); - - if (importMode == SelectedMissionMode.CREATE_NEW_MISSION) { - - // create voyage in db - CommonDataCompleteImportService service = - newService(CommonDataCompleteImportService.class); - - Mission missionToCreate = getMission(); - - Mission missionSaved = service.createMission(missionToCreate); - - getModel().setMissionId(missionSaved.getTopiaId()); - } - - return SUCCESS; - } - - public Map<String, String> getMissions() { - return missions; - } - - public Map<String, String> getAreaOfOperations() { - return areaOfOperations; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public Map<String, String> getImportModes() { - return importModes; - } - - public SelectedMissionMode getImportMode() { - return importMode; - } - - public Mission getMission() { - if (mission == null) { - mission = new MissionImpl(); - } - return mission; - } - - public void setImportMode(SelectedMissionMode importMode) { - this.importMode = importMode; - } - - public void setVoyageFile(File file) { - getModel().getVoyageFile().setFile(file); - } - - public void setVoyageFileContentType(String contentType) { - getModel().getVoyageFile().setContentType(contentType); - } - - public void setVoyageFileFileName(String fileName) { - getModel().getVoyageFile().setFileName(fileName); - } - - public void setTransitFile(File file) { - getModel().getTransitFile().setFile(file); - } - - public void setTransitFileContentType(String contentType) { - getModel().getTransitFile().setContentType(contentType); - } - - public void setTransitFileFileName(String fileName) { - getModel().getTransitFile().setFileName(fileName); - } - - public void setTransectFile(File file) { - getModel().getTransectFile().setFile(file); - } - - public void setTransectFileContentType(String contentType) { - getModel().getTransectFile().setContentType(contentType); - } - - public void setTransectFileFileName(String fileName) { - getModel().getTransectFile().setFileName(fileName); - } - - public void setEchotypeFile(File file) { - getModel().getEchotypeFile().setFile(file); - } - - public void setEchotypeFileContentType(String contentType) { - getModel().getEchotypeFile().setContentType(contentType); - } - - public void setEchotypeFileFileName(String fileName) { - getModel().getEchotypeFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java (from rev 284, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,92 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; + +import java.io.File; +import java.util.Map; + +/** + * Configure a "common data from transect" import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class ConfigureCommonDataFromTransect extends AbstractConfigureImport<CommonDataFromTransectImportConfiguration> { + + private static final long serialVersionUID = 1L; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + /** Universe of existing vessels. */ + protected Map<String, String> vessels; + + public ConfigureCommonDataFromTransect() { + super(CommonDataFromTransectImportConfiguration.class); + } + + @Override + protected CommonDataFromTransectImportConfiguration createModel() { + return new CommonDataFromTransectImportConfiguration(getLocale()); + } + + @Override + public String input() throws Exception { + + super.input(); + + EchoBaseServiceSupport service = + newService(EchoBaseServiceSupport.class); + + voyages = loadSortAndDecorate(service, Voyage.class); + vessels = loadSortAndDecorate(service, Vessel.class); + + return INPUT; + } + + public Map<String, String> getVoyages() { + return voyages; + } + + public Map<String, String> getVessels() { + return vessels; + } + + public void setTransectFile(File file) { + getModel().getTransectFile().setFile(file); + } + + public void setTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); + } + + public void setTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransectImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,92 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.Vessel; -import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; - -import java.io.File; -import java.util.Map; - -/** - * Configure a "common data from transect" import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class ConfigureCommonDataFromTransectImport extends AbstractConfigureImport<CommonDataFromTransectImportConfiguration> { - - private static final long serialVersionUID = 1L; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - /** Universe of existing vessels. */ - protected Map<String, String> vessels; - - public ConfigureCommonDataFromTransectImport() { - super(CommonDataFromTransectImportConfiguration.class); - } - - @Override - protected CommonDataFromTransectImportConfiguration createModel() { - return new CommonDataFromTransectImportConfiguration(getLocale()); - } - - @Override - public String input() throws Exception { - - super.input(); - - EchoBaseServiceSupport service = - newService(EchoBaseServiceSupport.class); - - voyages = loadSortAndDecorate(service, Voyage.class); - vessels = loadSortAndDecorate(service, Vessel.class); - - return INPUT; - } - - public Map<String, String> getVoyages() { - return voyages; - } - - public Map<String, String> getVessels() { - return vessels; - } - - public void setTransectFile(File file) { - getModel().getTransectFile().setFile(file); - } - - public void setTransectFileContentType(String contentType) { - getModel().getTransectFile().setContentType(contentType); - } - - public void setTransectFileFileName(String fileName) { - getModel().getTransectFile().setFileName(fileName); - } -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.AccousticDataImportService; +import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchAccousticData extends AbstractLaunchImport<AccousticDataImportConfiguration, AccousticDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchAccousticData() { + super(AccousticDataImportConfiguration.class, AccousticDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.AccousticDataImportService; -import fr.ifremer.echobase.services.configurations.AccousticDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchAccousticDataImport extends AbstractLaunchImport<AccousticDataImportConfiguration, AccousticDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchAccousticDataImport() { - super(AccousticDataImportConfiguration.class, AccousticDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.AccousticRegionDataImportService; +import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchAccousticRegionData extends AbstractLaunchImport<AccousticRegionDataImportConfiguration, AccousticRegionDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchAccousticRegionData() { + super(AccousticRegionDataImportConfiguration.class, AccousticRegionDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticRegionDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.AccousticRegionDataImportService; -import fr.ifremer.echobase.services.configurations.AccousticRegionDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchAccousticRegionDataImport extends AbstractLaunchImport<AccousticRegionDataImportConfiguration, AccousticRegionDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchAccousticRegionDataImport() { - super(AccousticRegionDataImportConfiguration.class, AccousticRegionDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesDataImportService; +import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesData extends AbstractLaunchImport<CatchesDataImportConfiguration, CatchesDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesData() { + super(CatchesDataImportConfiguration.class, CatchesDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesDataImportService; -import fr.ifremer.echobase.services.configurations.CatchesDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesDataImport extends AbstractLaunchImport<CatchesDataImportConfiguration, CatchesDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesDataImport() { - super(CatchesDataImportConfiguration.class, CatchesDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesIndividualDataImportService; +import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesIndividualData extends AbstractLaunchImport<CatchesIndividualDataImportConfiguration, CatchesIndividualDataImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesIndividualData() { + super(CatchesIndividualDataImportConfiguration.class, CatchesIndividualDataImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesIndividualDataImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesIndividualDataImportService; -import fr.ifremer.echobase.services.configurations.CatchesIndividualDataImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesIndividualDataImport extends AbstractLaunchImport<CatchesIndividualDataImportConfiguration, CatchesIndividualDataImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesIndividualDataImport() { - super(CatchesIndividualDataImportConfiguration.class, CatchesIndividualDataImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.CatchesReferenceImportService; +import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchCatchesReference extends AbstractLaunchImport<CatchesReferenceImportConfiguration, CatchesReferenceImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCatchesReference() { + super(CatchesReferenceImportConfiguration.class, CatchesReferenceImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReference.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCatchesReferenceImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.CatchesReferenceImportService; -import fr.ifremer.echobase.services.configurations.CatchesReferenceImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchCatchesReferenceImport extends AbstractLaunchImport<CatchesReferenceImportConfiguration, CatchesReferenceImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCatchesReferenceImport() { - super(CatchesReferenceImportConfiguration.class, CatchesReferenceImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.CommonDataCompleteImportService; +import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchCommonDataComplete extends AbstractLaunchImport<CommonDataCompleteImportConfiguration, CommonDataCompleteImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCommonDataComplete() { + super(CommonDataCompleteImportConfiguration.class, CommonDataCompleteImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataComplete.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataCompleteImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.CommonDataCompleteImportService; -import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchCommonDataCompleteImport extends AbstractLaunchImport<CommonDataCompleteImportConfiguration, CommonDataCompleteImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCommonDataCompleteImport() { - super(CommonDataCompleteImportConfiguration.class, CommonDataCompleteImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java (from rev 267, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java 2012-01-15 22:12:51 UTC (rev 285) @@ -0,0 +1,43 @@ +/* + * #%L + * EchoBase :: UI + * + * $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.ui.actions.importData; + +import fr.ifremer.echobase.services.CommonDataFromTransectImportService; +import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchCommonDataFromTransect extends AbstractLaunchImport<CommonDataFromTransectImportConfiguration, CommonDataFromTransectImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchCommonDataFromTransect() { + super(CommonDataFromTransectImportConfiguration.class, CommonDataFromTransectImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransect.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchCommonDataFromTransectImport.java 2012-01-15 22:12:51 UTC (rev 285) @@ -1,43 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * - * $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.ui.actions.importData; - -import fr.ifremer.echobase.services.CommonDataFromTransectImportService; -import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchCommonDataFromTransectImport extends AbstractLaunchImport<CommonDataFromTransectImportConfiguration, CommonDataFromTransectImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchCommonDataFromTransectImport() { - super(CommonDataFromTransectImportConfiguration.class, CommonDataFromTransectImportService.class); - } - -} Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -46,7 +46,7 @@ <!-- Configure import --> <action name="configure*" - class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> + class="fr.ifremer.echobase.ui.actions.importData.Configure{1}"> <interceptor-ref name="paramsPrepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}.jsp</result> <result type="redirectAction"> @@ -57,7 +57,7 @@ <!-- Starts import --> <action name="import*" - class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> + class="fr.ifremer.echobase.ui.actions.importData.Launch{1}"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importData/progress{1}.jsp</result> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -57,8 +57,9 @@ </field-validator> </field> - <field name="model.moviesFile.file"> - <field-validator type="required"> + <field name="moviesFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.moviesFile.file!=null</param> <message key="echobase.error.import.moviesFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -38,14 +38,16 @@ </field-validator> </field> - <field name="model.regionsFile.file"> - <field-validator type="required"> + <field name="regionsFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.regionsFile.file!=null</param> <message key="echobase.error.import.regionsFile.required"/> </field-validator> </field> - <field name="model.associationFile.file"> - <field-validator type="required"> + <field name="associationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.associationFile.file!=null</param> <message key="echobase.error.import.associationFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -32,26 +32,30 @@ </field-validator> </field> - <field name="model.tlbeStationFile.file"> - <field-validator type="required"> + <field name="tlbeStationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tlbeStationFile.file!=null</param> <message key="echobase.error.import.tlbeStationFile.required"/> </field-validator> </field> - <field name="model.xtblTriFile.file"> - <field-validator type="required"> + <field name="xtblTriFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.xtblTriFile.file!=null</param> <message key="echobase.error.import.xtblTriFile.required"/> </field-validator> </field> - <field name="model.tblMensurationFile.file"> - <field-validator type="required"> + <field name="tblMensurationFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tblMensurationFile.file!=null</param> <message key="echobase.error.import.tblMensurationFile.required"/> </field-validator> </field> - <field name="model.tblMensurationClasseFile.file"> - <field-validator type="required"> + <field name="tblMensurationClasseFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.tblMensurationClasseFile.file!=null</param> <message key="echobase.error.import.tblMensurationClasseFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -32,8 +32,9 @@ </field-validator> </field> - <field name="model.individualDataFile.file"> - <field-validator type="required"> + <field name="individualDataFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.individualDataFile.file!=null</param> <message key="echobase.error.import.individualDataFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -26,14 +26,16 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> - <field name="model.lengthAgeKeyFile.file"> - <field-validator type="required"> + <field name="lengthAgeKeyFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.lengthAgeKeyFile.file!=null</param> <message key="echobase.error.import.lengthAgeKeyFile.required"/> </field-validator> </field> - <field name="model.lengthWeightKeyFile.file"> - <field-validator type="required"> + <field name="lengthWeightKeyFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.lengthWeightKeyFile.file!=null</param> <message key="echobase.error.import.lengthWeightKeyFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataComplete-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -80,26 +80,30 @@ </field-validator> </field> - <field name="model.voyageFile.file"> - <field-validator type="required"> + <field name="voyageFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.voyageFile.file!=null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> - <field name="model.transitFile.file"> - <field-validator type="required"> + <field name="transitFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transitFile.file!=null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> - <field name="model.transectFile.file"> - <field-validator type="required"> + <field name="transectFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transectFile.file!=null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> - <field name="model.echotypeFile.file"> - <field-validator type="required"> + <field name="echotypeFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.echotypeFile.file!=null</param> <message key="echobase.error.import.echotypeFile.required"/> </field-validator> </field> Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-15 22:12:51 UTC (rev 285) @@ -63,8 +63,9 @@ </field-validator> </field> - <field name="model.transectFile.file"> - <field-validator type="required"> + <field name="transectFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.transectFile.file!=null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> 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-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-15 22:12:51 UTC (rev 285) @@ -19,27 +19,29 @@ echobase.action.reloadSqlQuery=Recharger echobase.action.reset=Annuler echobase.action.return=Retour -echobase.common.transitRelatedActivity=RelatedActivity (transit) -echobase.common.transectLicence=Licence (transect) -echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) -echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) -echobase.common.echosounderSoundSpeed=echosounderSoundSpeed -echobase.common.soundSpeedCalculations=soundSpeedCalculations -echobase.common.pingDutyCycle=pingDutyCycle -echobase.common.notes=notes echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Enregistrer la requête echobase.common.admin=Administrateur +echobase.common.echosounderSoundSpeed=echosounderSoundSpeed echobase.common.email=Email echobase.common.entityType=Type d'entité echobase.common.importDataMode=Type d'import echobase.common.importMode=Type de mission echobase.common.importMode.createNewMission=Créer une nouvelle mission echobase.common.importMode.useExistingMission=Utiliser une mission existante +echobase.common.importResult=Résultat \: +echobase.common.inProgress=en cours... echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion +echobase.common.notes=notes echobase.common.password=Mot de passe +echobase.common.pingDutyCycle=pingDutyCycle +echobase.common.soundSpeedCalculations=soundSpeedCalculations +echobase.common.transectBinUnitsPingAxis=BinUnitsPingAxis (transect) +echobase.common.transectGeospatialVerticalPositive=GeospatialVerticalPositive (transect) +echobase.common.transectLicence=Licence (transect) +echobase.common.transitRelatedActivity=RelatedActivity (transit) echobase.common.user=Utilisateur echobase.common.voyageDescription=Description echobase.error.bad.password=Mot de passe incorrrect Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.accousticData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.accousticData"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.accousticRegionData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.accousticRegionData"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesData"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesIndividualData"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesIndividualData"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.catchesReferences"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.catchesReferences"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.commonDataComplete"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.commonDataComplete"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title>Configuration <s:text name="echobase.common.importDataMode.commonDataFromTransect"/></title> +<title>Configuration <s:text + name="echobase.common.importDataMode.commonDataFromTransect"/></title> <script type="text/javascript"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-AccousticData" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.accousticData"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-AccousticRegionData" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.accousticRegionData"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-CatchesData" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.catchesData"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-CatchesIndividualData" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.accousticRegionData"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-CatchesReference" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.catchesReferences"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,8 @@ <s:url id="url" action="import-CommonDataComplete" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title><s:text name="echobase.common.importDataMode.commonDataComplete"/> + <s:text name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -28,7 +28,9 @@ <s:url id="url" action="import-CommonDataFromTransect" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> -<title><s:text name="echobase.title.importDataProgress"/></title> +<title> + <s:text name="echobase.common.importDataMode.commonDataFromTransect"/> <s:text + name="echobase.common.inProgress"/></title> <%-- TODO letellier 20111104 : Add warn icon --%> <p><s:text name="echobase.message.warnImportInProgress"/></p> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.accousticData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.accousticData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticRegionData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.accousticRegionData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.accousticRegionData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesIndividualData.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesIndividualData"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesIndividualData"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesReference.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.catchesReference"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.catchesReferences"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataComplete.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.commonDataComplete"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.commonDataComplete"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonDataFromTransect.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -24,7 +24,8 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importDataResult.commonDataFromTransect"/></title> +<title><s:text name="echobase.common.importResult"/> <s:text + name="echobase.common.importDataMode.commonDataFromTransect"/></title> <fieldset> <legend> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-01-15 21:33:13 UTC (rev 284) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2012-01-15 22:12:51 UTC (rev 285) @@ -31,12 +31,12 @@ function updateMode(newValue) { // change the action target $('#selectImportType_configure').attr('name', - 'action:configure-'+newValue+'!input'); + 'action:configure-' + newValue + '!input'); } jQuery(document).ready(function () { - $('[name="mode"]').change(function(event) { + $('[name="mode"]').change(function (event) { updateMode(this.value); }); var val = $('[name="mode"][checked="checked"]').val(); @@ -52,7 +52,7 @@ </legend> <s:radio key='mode' list="modes" cssClass="cleanBoth" label='%{getText("echobase.common.importDataMode")}' - required="true" template="myradiomap" /> + required="true" template="myradiomap"/> </fieldset>