Author: tchemit Date: 2012-03-30 22:13:39 +0200 (Fri, 30 Mar 2012) New Revision: 463 Url: http://forge.codelutin.com/repositories/revision/echobase/463 Log: fixes #1057: Probl?\195?\168me lors de l'affichage d'un import acoustique Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticImport.java Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticImport.java 2012-03-30 19:36:46 UTC (rev 462) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticImport.java 2012-03-30 20:13:39 UTC (rev 463) @@ -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.importdata.AcousticImportConfiguration; -import fr.ifremer.echobase.services.importdata.AcousticImportService; - -/** - * Configure a accoustic data import. - * - * @author tchemit <chemit@codelutin.com> - * @since 0.3 - */ -public class LaunchAccousticImport extends AbstractLaunchImport<AcousticImportConfiguration, AcousticImportService> { - - private static final long serialVersionUID = 1L; - - public LaunchAccousticImport() { - super(AcousticImportConfiguration.class, AcousticImportService.class); - } - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java (from rev 460, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAccousticImport.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java 2012-03-30 20:13:39 UTC (rev 463) @@ -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.importdata.AcousticImportConfiguration; +import fr.ifremer.echobase.services.importdata.AcousticImportService; + +/** + * Configure a accoustic data import. + * + * @author tchemit <chemit@codelutin.com> + * @since 0.3 + */ +public class LaunchAcousticImport extends AbstractLaunchImport<AcousticImportConfiguration, AcousticImportService> { + + private static final long serialVersionUID = 1L; + + public LaunchAcousticImport() { + super(AcousticImportConfiguration.class, AcousticImportService.class); + } + +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/LaunchAcousticImport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2012-03-30 19:36:46 UTC (rev 462) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAcousticImport-validation.xml 2012-03-30 20:13:39 UTC (rev 463) @@ -31,12 +31,6 @@ </field-validator> </field> - <field name="model.transitId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.transit.required"/> - </field-validator> - </field> - <field name="model.vesselId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.vessel.required"/> @@ -70,12 +64,6 @@ </field-validator> </field> - <field name="model.echosounderSoundSpeed"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.echosounderSoundSpeed.required"/> - </field-validator> - </field> - <field name="model.loggedDataFormat"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.loggedDataFormat.required"/> @@ -126,13 +114,6 @@ </field-validator> </field> - <field name="model.digitThreshold"> - <field-validator type="nrequiredstring"> - <message - key="echobase.error.import.digitThreshold.required"/> - </field-validator> - </field> - <field name="model.acousticDensityUnit"> <field-validator type="nrequiredstring"> <message Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2012-03-30 19:36:46 UTC (rev 462) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progressAcousticImport.jsp 2012-03-30 20:13:39 UTC (rev 463) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="importAccoustic" namespace="/importData"/> +<s:url id="url" action="importAcoustic" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> <title>