Author: tchemit Date: 2012-03-12 09:29:59 +0100 (Mon, 12 Mar 2012) New Revision: 355 Url: http://forge.codelutin.com/repositories/revision/echobase/355 Log: result config screen Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpecies-validation.xml Removed: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcoustic-validation.xml Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2012-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java 2012-03-12 08:29:59 UTC (rev 355) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.ui.actions; +import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import fr.ifremer.echobase.EchoBaseConfiguration; @@ -240,19 +241,19 @@ protected void copyFile(InputFile inputFile, File dataDirectory) throws IOException { + Preconditions.checkNotNull(inputFile); + Preconditions.checkNotNull(dataDirectory); File source = inputFile.getFile(); - if (source != null) { + Preconditions.checkNotNull(source); - File target = new File(dataDirectory, inputFile.getFileName()); - if (log.isInfoEnabled()) { - log.info("Copy file " + source + " to " + target); - } - FileUtils.copyFile(source, target); - - // keep target (source file will be removed at the end of this action) - inputFile.setFile(target); + File target = new File(dataDirectory, inputFile.getFileName()); + if (log.isInfoEnabled()) { + log.info("Copy file " + source + " to " + target); } + FileUtils.copyFile(source, target); + // keep target (source file will be removed at the end of this action) + inputFile.setFile(target); } protected <E extends Enum<E> & I18nAble> Map<String, String> decorateEnums(E... enumValues) { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2012-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java 2012-03-12 08:29:59 UTC (rev 355) @@ -94,7 +94,9 @@ } for (InputFile inputFile : importModel.getInputFiles()) { - copyFile(inputFile, dataDirectory); + if (inputFile.hasFile()) { + copyFile(inputFile, dataDirectory); + } } setInSession(importModel); return SUCCESS; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResults.java 2012-03-12 08:29:59 UTC (rev 355) @@ -52,6 +52,8 @@ /** Universe of possible import modes. */ protected Map<String, String> importModes; + protected String resultLabel; + public ConfigureResults() { super(ResultsImportConfiguration.class); } @@ -116,6 +118,15 @@ return importModes; } + + public String getResultLabel() { + return resultLabel; + } + + public void setResultLabel(String resultLabel) { + this.resultLabel = resultLabel; + } + public void setRegionsFile(File file) { getModel().getRegionsFile().setFile(file); } @@ -175,4 +186,29 @@ public void setEchotypeFileFileName(String fileName) { getModel().getEchotypeFile().setFileName(fileName); } + + public void setAcousticByEchotypeFile(File file) { + getModel().getAcousticByEchotypeFile().setFile(file); + } + + public void setAcousticByEchotypeFileContentType(String contentType) { + getModel().getAcousticByEchotypeFile().setContentType(contentType); + } + + public void setAcousticByEchotypeFileName(String fileName) { + getModel().getAcousticByEchotypeFile().setFileName(fileName); + } + + public void setAcousticByEchotypeAndSpeciesFile(File file) { + getModel().getAcousticByEchotypeAndSpeciesFile().setFile(file); + } + + public void setAcousticByEchotypeAndSpeciesFileContentType(String contentType) { + getModel().getAcousticByEchotypeAndSpeciesFile().setContentType(contentType); + } + + public void setAcousticByEchotypeAndSpeciesFileName(String fileName) { + getModel().getAcousticByEchotypeAndSpeciesFile().setFileName(fileName); + } + } Deleted: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcoustic-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcoustic-validation.xml 2012-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcoustic-validation.xml 2012-03-12 08:29:59 UTC (rev 355) @@ -1,55 +0,0 @@ -<!-- - #%L - EchoBase :: UI - - $Id$ - $HeadURL$ - %% - Copyright (C) 2011 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="model.voyageId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.voyage.required"/> - </field-validator> - </field> - - <field name="model.vesselId"> - <field-validator type="nrequiredstring"> - <message key="echobase.error.import.vessel.required"/> - </field-validator> - </field> - - <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="associationFile"> - <field-validator type="nfieldexpression"> - <param name="expression">model.associationFile.file!=null</param> - <message key="echobase.error.import.associationFile.required"/> - </field-validator> - </field> - -</validators> \ No newline at end of file Copied: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml (from rev 353, trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcoustic-validation.xml) =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml 2012-03-12 08:29:59 UTC (rev 355) @@ -0,0 +1,48 @@ +<!-- + #%L + EchoBase :: UI + + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticByEchotypeFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.acousticByEchotypeFile.file!=null</param> + <message key="echobase.error.import.acousticByEchotypeFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotype-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpecies-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpecies-validation.xml (rev 0) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpecies-validation.xml 2012-03-12 08:29:59 UTC (rev 355) @@ -0,0 +1,48 @@ +<!-- + #%L + EchoBase :: UI + + $Id: ConfigureResults-ConfigureResults-modeAcoustic-validation.xml 304 2012-02-02 22:58:29Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="model.voyageId"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.voyage.required"/> + </field-validator> + </field> + + <field name="resultLabel"> + <field-validator type="nrequiredstring"> + <message key="echobase.error.import.resultLabel.required"/> + </field-validator> + </field> + + <field name="acousticByEchotypeAndSpeciesFile"> + <field-validator type="nfieldexpression"> + <param name="expression">model.acousticByEchotypeAndSpeciesFile.file!=null</param> + <message key="echobase.error.import.acousticByEchotypeAndSpeciesFile.required"/> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureResults-ConfigureResults-modeAcousticByEchotypeAndSpecies-validation.xml ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-03-12 08:29:59 UTC (rev 355) @@ -19,6 +19,9 @@ echobase.error.export.sqlQuery.forbidden.drop.word=Export query contains a forbidden word 'DROP' echobase.error.export.sqlQuery.forbidden.insert.word=Export query contains a forbidden word 'INSERT' echobase.error.export.sqlQuery.forbidden.update.word=Export query contains a forbidden word 'UPDATE' +echobase.error.import.acousticByEchotypeAndSpeciesFile.required=Import file is mandatory +echobase.error.import.acousticByEchotypeFile.required=Import file is mandatory +echobase.error.import.resultLabel.required=ResultLabel is required echobase.error.invalid.sql=Invalid request \: %s echobase.error.login.unknown=Unkwon login echobase.error.mission.name.already.exist=Mission name already exists @@ -26,6 +29,7 @@ echobase.error.no.embeddedApplication.exportFileFound= echobase.error.no.exportDb.configurationFound= echobase.error.no.exportDb.exportFileFound= +echobase.common.resultLabel=Result label echobase.error.query.name.already.exists=Query name already used echobase.error.required.email=Email is required echobase.error.required.password=Password is required 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-03-12 08:29:35 UTC (rev 354) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-03-12 08:29:59 UTC (rev 355) @@ -70,6 +70,7 @@ echobase.common.transitRelatedActivity=RelatedActivity (transit) echobase.common.user=Utilisateur echobase.common.voyageDescription=Description +echobase.common.resultLabel=Result label echobase.confirm.delete.query=Confirmer la suppression de la requète suivante echobase.error.bad.password=Mot de passe incorrrect echobase.error.email.already.used=Nom d'utilisateur déjà pris @@ -82,6 +83,8 @@ echobase.error.export.sqlQuery.forbidden.update.word=La requète contient le mot 'UPDATE', ce qui est interdit echobase.error.export.sqlQuery.requiredstring=La requête de l'export est obligatoire echobase.error.export.sqlQuery.wrongformat=La requêtes n'est pas valide +echobase.error.import.acousticByEchotypeAndSpeciesFile.required=La sélection d'un fichier d'import est obligatoire +echobase.error.import.acousticByEchotypeFile.required=La sélection d'un fichier d'import est obligatoire echobase.error.import.acousticDensityUnit.required=acousticDensityUnit non renseigné echobase.error.import.acquisitionSoftwareVersionER60.required=acquisitionSoftwareVersionER60 non renseigné echobase.error.import.acquisitionSoftwareVersionME70.required=acquisitionSoftwareVersionME70 non renseigné @@ -110,6 +113,7 @@ echobase.error.import.processingTemplate.required=processingTemplate non renseigné echobase.error.import.regionsFile.required=La sélection d'un fichier Region est obligatoire echobase.error.import.resultImportFile.required=Veuillez donner au moins un fichier à importer +echobase.error.import.resultLabel.required=Le champs ResultLabel est obligatoire echobase.error.import.soundSpeedCalculationsER60.required=soundSpeedCalculationsER60 non renseigné echobase.error.import.soundSpeedCalculationsME70.required=soundSpeedCalculationsME70 non renseigné echobase.error.import.sounderConstant.required=sounderConstant non renseigné @@ -127,7 +131,6 @@ echobase.error.import.voyage.required=La sélection d'une campagne est obligatoire echobase.error.import.voyageDescription.required=Description de la campagne non rengeigné echobase.error.import.voyageFile.required=La sélection d'un fichier Voyage est obligatoire -echobase.error.import.xtblTriFile.required=La sélection d'un fichier xtblTri est obligatoire echobase.error.importFile.required=Fichier d'import obligatoire echobase.error.importHistorical.input.required=Le fichier d'import est obligatoire echobase.error.invalid.sql=Requète non valide \: %s