[Tutti-commits] r1436 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti tutti-persistence/src/main/resources/i18n tutti-service tutti-service/src/license tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic tutti-service/src/main/java/fr/ifremer/tutti/service/report tutti-service/src/main/resources/i18n tutti-service/src/test/java/fr/ifremer/tutti/service/report tutti-service/src/test/resources/report tutti-service/src/test/res

Author: tchemit Date: 2013-12-09 14:51:06 +0100 (Mon, 09 Dec 2013) New Revision: 1436 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1436 Log: fixes #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt Added: trunk/tutti-service/src/test/resources/report/exportCruise/ trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv trunk/tutti-service/src/test/resources/report/exportCruise/species.csv trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties Removed: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/pom.xml trunk/tutti-service/src/license/THIRD-PARTY.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.sh trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -139,7 +139,7 @@ <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> - <birtVersion>4.2.1a</birtVersion> + <birtVersion>4.3.1-1</birtVersion> <bluecoveVersion>2.1.0</bluecoveVersion> @@ -410,22 +410,8 @@ <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> <version>${birtVersion}</version> - <exclusions> - <exclusion> - <groupId>milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - <exclusion> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - </exclusion> - </exclusions> + <classifier>codelutin</classifier> </dependency> - <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <version>1.3</version> - </dependency> <!-- Jdbc drivers --> <dependency> @@ -560,6 +546,31 @@ </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <configuration> + <licenseMerges> + <licenseMerge>The Apache Software License, Version 2.0| + Apache License, Version 2.0 + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU LESSER GENERAL PUBLIC LICENSE + </licenseMerge> + <licenseMerge>General Public License (GPL)| + GNU Lesser General Public License + </licenseMerge> + <licenseMerge> + Common Development and Distribution License (CDDL) v1.0| + COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 + </licenseMerge> + <licenseMerge>BSD License|BSD</licenseMerge> + </licenseMerges> + <excludedGroups>milyn</excludedGroups> + <addSvnKeyWords>false</addSvnKeyWords> + </configuration> + </plugin> + </plugins> </pluginManagement> <extensions> @@ -654,7 +665,7 @@ <includes> <include>pom.xml</include> </includes> - <addSvnKeyWords>false</addSvnKeyWords> + <!--<addSvnKeyWords>false</addSvnKeyWords>--> <verbose>false</verbose> </configuration> </execution> @@ -665,78 +676,6 @@ </profile> <profile> - <id>deploy-update-tutti-update</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <build> - <defaultGoal>deploy</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>copy update-tutti.properties to site</id> - <phase>package</phase> - <inherited>false</inherited> - <configuration> - <tasks> - <echo message="copy tutti-application.properties to site" /> - <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> - <filterset> - <filter value="${project.version}" token="projectVersion" /> - <filter value="${jreVersion}" token="jreVersion" /> - <filter value="${dbVersion}" token="dbVersion" /> - <filter value="${reportVersion}" token="reportVersion" /> - </filterset> - <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties" /> - </fileset> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> - <executions> - <execution> - <id>deploy update-tutti.properties</id> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>forge.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/update-tutti.properties - </fromFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - </executions> - - </plugin> - </plugins> - </build> - - </profile> - - <profile> <id>deploy-tutti-application-update</id> <activation> <property> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -278,7 +278,8 @@ try { applicationConfig.save(file, false, optionKeyToNotSave); } catch (IOException e) { - throw new ApplicationTechnicalException(_("tutti.config.save.error", file), e); + throw new ApplicationTechnicalException( + _("tutti.config.save.error", file), e); } } @@ -457,6 +458,12 @@ return result; } + /** @return {@link TuttiConfigurationOption#REPORT_LOG_FILE} value */ + public File getReportLogFile() { + File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_FILE.getKey()); + return result; + } + /** @return {@link TuttiConfigurationOption#REPORT_BACKUP_DIRECTORY} value */ public File getReportBackupDirectory() { File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY.getKey()); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -94,7 +94,11 @@ n_("tutti.config.option.report.directory.description"), "${tutti.report.home.directory}/allegro-tutti/reports", File.class), - + REPORT_LOG_FILE( + "tutti.report.log.file", + n_("tutti.config.option.report.log.file.description"), + "${tutti.data.directory}/report-${version}.log", + File.class), DB_DIRECTORY( "tutti.persistence.db.directory", n_("tutti.config.option.persistence.db.directory.description"), Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -32,6 +32,7 @@ tutti.config.option.report.backup.directory.description= tutti.config.option.report.directory.description= tutti.config.option.report.home.directory.description= +tutti.config.option.report.log.file.description= tutti.config.option.samplingCategoryOrderIds.description= tutti.config.option.site.url.description= tutti.config.option.startActionFile.description= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -162,6 +162,7 @@ tutti.config.option.report.backup.directory.description=Répertoire contenant les rapports générés tutti.config.option.report.directory.description=Répertoire contenant les modèles de rapports tutti.config.option.report.home.directory.description=Répertoire contenant la structure nécessaire pour les rapport +tutti.config.option.report.log.file.description=Fichier de log utilisé lors de la génération des rapport Birt tutti.config.option.samplingCategoryOrderIds.description=Ordre des catégories d'échantillonnage tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -41,6 +41,335 @@ <dependencies> + <!--<dependency>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.birt.runtime</artifactId>--> + <!--<version>${birtVersion}</version>--> + <!--<exclusions>--> + <!--<exclusion>--> + <!--<groupId>milyn</groupId>--> + <!--<artifactId>flute</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.milyn</groupId>--> + <!--<artifactId>flute</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>commons-cli</groupId>--> + <!--<artifactId>commons-cli</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.hsqldb.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.mysql</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.ibm.informix--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.ibm.db2.luw--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.hsqldb</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.enablement.ibm.informix.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.postgresql</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.connectivity.apache.derby.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.oracle</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.msft.sqlserver--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.oracle.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.mysql.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.enablement.postgresql.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.modelbase.derby</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.apache.derby--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.console.profile--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.oda.design--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.oda.ws</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.modelbase.sql</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.modelbase.sql.query</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>--> + <!--org.eclipse.datatools.connectivity.dbdefinition.genericJDBC--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.enablement.oda.xml</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.db.generic--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.modelbase.dbdefinition--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.oda.profile--> + <!--</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.datatools.connectivity.sqm.core</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.emf.ecore.change</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.core.expressions</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.emf</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.core.resources</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.core.filesystem</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.core.contenttype</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.apache.commons.logging</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.pdf</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.dom.svg</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.dom</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.css</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.ext.awt</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.transcoder</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.util</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.xml</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.orbit.mongodb</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.commons.codec</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.bridge</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.parser</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.util.gui</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.batik.svggen</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.equinox.app</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.equinox.preferences</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.osgi.services</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.xerces</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>derby</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.xml.resolver</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.apache.xml.serializer</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.w3c.dom.svg</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.w3c.css.sac</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>javax.wsdl</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.w3c.dom.smil</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>javax.xml.stream</artifactId>--> + <!--</exclusion>--> + <!--<!–exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>org.mozilla.javascript</artifactId>--> + <!--</exclusion–>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>Tidy</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime.3_7_1</groupId>--> + <!--<artifactId>com.lowagie.text</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>com.ibm.icu</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.eclipse.birt.runtime</groupId>--> + <!--<artifactId>org.eclipse.update.configurator</artifactId>--> + <!--</exclusion>--> + + <!--<exclusion>--> + <!--<groupId>org.apache.poi</groupId>--> + <!--<artifactId>poi</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.poi</groupId>--> + <!--<artifactId>poi-ooxml</artifactId>--> + <!--</exclusion>--> + <!--<exclusion>--> + <!--<groupId>org.apache.poi</groupId>--> + <!--<artifactId>poi-ooxml-schemas</artifactId>--> + <!--</exclusion>--> + <!--</exclusions>--> + <!--</dependency>--> + <!-- Sibling dependencies --> <dependency> <groupId>${project.groupId}</groupId> @@ -140,13 +469,8 @@ <dependency> <groupId>org.eclipse.birt.runtime</groupId> <artifactId>org.eclipse.birt.runtime</artifactId> + <classifier>codelutin</classifier> </dependency> - <!-- fix a m-license-p bug ... --> - <dependency> - <groupId>org.milyn</groupId> - <artifactId>flute</artifactId> - <scope>runtime</scope> - </dependency> <!-- Logging --> <dependency> @@ -185,6 +509,7 @@ <value>fr.ifremer.tutti.persistence.test.TuttiRunListener</value> </property> </properties> + <argLine>-Xmx1024M -XX:MaxPermSize=256m</argLine> </configuration> </plugin> </plugins> Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -6,18 +6,22 @@ # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License +# - ICU License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Java HTML Tidy License # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - Mozilla Public License # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -27,8 +31,21 @@ # Please fill the missing licenses for dependencies : # # -#Wed Dec 04 12:30:42 CET 2013 +#Sun Dec 08 20:03:42 CET 2013 antlr--antlr--2.7.6=BSD License +batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 +batik--batik-bridge--1.6=The Apache Software License, Version 2.0 +batik--batik-css--1.6=The Apache Software License, Version 2.0 +batik--batik-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-ext--1.6=The Apache Software License, Version 2.0 +batik--batik-gvt--1.6=The Apache Software License, Version 2.0 +batik--batik-parser--1.6=The Apache Software License, Version 2.0 +batik--batik-script--1.6=The Apache Software License, Version 2.0 +batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-svggen--1.6=The Apache Software License, Version 2.0 +batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 +batik--batik-util--1.6=The Apache Software License, Version 2.0 +batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -113,14 +113,13 @@ registerTuttiDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); -// registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY_WITH_UNIT, "${parameterName}$s (${unit}$s)", SEPARATOR, " - "); registerDecorator(CARACTERISTIC_PARAMETER_ONLY_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s")); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${description}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesReferenceTaxonId}", SEPARATOR, " - "); registerTuttiDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(LabelAware.class, "${label}$s", SEPARATOR, " - "); - registerTuttiDecorator(File.class, "${absolutePath}$s", SEPARATOR, " - "); + registerTuttiDecorator(File.class, "${name}$s", SEPARATOR, " - "); registerDecorator(new Decorator<Float>(Float.class) { private static final long serialVersionUID = 1L; @@ -135,7 +134,6 @@ registerDecorator(new SpeciesDecorator()); registerDecorator(FROM_PROTOCOL, new SpeciesFromProtocolDecorator()); -// registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerDecorator(CARACTERISTIC_WITH_UNIT, new SimpleCaracteristicDecorator("${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s")); TuttiDecorator<FishingOperation> fishingOperationTuttiDecorator = (TuttiDecorator<FishingOperation>) getDecoratorByType(FishingOperation.class); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -165,11 +165,10 @@ } ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); - progressionModel.setMessage( - _("tutti.service.exportCruise.buildZip", exportFile)); + increments(progressionModel, + _("tutti.service.exportCruise.buildZip", exportFile)); ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); - progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } @@ -212,11 +211,10 @@ exportCruise(cruise, exportContext, progressionModel); ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); - progressionModel.setMessage( + progressionModel.increments( _("tutti.service.exportCruise.buildZip", exportFile)); ApplicationIOUtil.zip(basedir, exportFile, _("tutti.service.export.zip.error", exportFile)); - progressionModel.increments(1); } finally { IOUtils.closeQuietly(exportContext); } @@ -227,6 +225,57 @@ } } + /** + * Export a cruise to file system in a temporary directory. + * + * @param cruiseId id of the cruise to export + * @return the directory containing the export files + * @since 3.0-rc-2 + */ + public File exportCruiseToFileSystem(String cruiseId) { + + Preconditions.checkNotNull(cruiseId); + + Cruise cruise = persistenceService.getCruise(cruiseId); + Preconditions.checkNotNull(cruise); + + if (log.isDebugEnabled()) { + log.debug("Will export cruise: " + cruiseId); + } + + // check cruise fishing operations + ApplicationBusinessException checkError = null; + try { + checkCruise(null, cruise); + } catch (ApplicationBusinessException e) { + // error while checking cruise + if (log.isDebugEnabled()) { + log.debug("Got a check cruise error", e); + } + checkError = e; + } + + File basedir = new File(context.getConfig().newTempFile( + "exportCruise"), "exportCruise-" + cruiseId); + + ApplicationIOUtil.forceMkdir(basedir, _("tutti.io.mkDir.error", basedir)); + + ExportContext exportContext = createExportContext(basedir); + + try { + exportCruise(cruise, exportContext, null); + ApplicationIOUtil.close(exportContext, _("tutti.service.export.closeContext.error")); + } finally { + IOUtils.closeQuietly(exportContext); + } + + if (checkError != null) { + // rethrow error + throw checkError; + } + return basedir; + } + protected ExportContext createExportContext(File basedir) { @@ -251,16 +300,13 @@ protected void checkCruise(ProgressionModel progressionModel, Cruise cruise) { Preconditions.checkNotNull(cruise); + increments(progressionModel, + _("tutti.service.exportCruise.checkCruise", cruise.getName())); - progressionModel.setMessage( - _("tutti.service.exportCruise.checkCruise", cruise.getName())); - // check cruise fishing operations Map<String, String> errors = weightComputingService.checkCruise(cruise.getId()); - progressionModel.increments(1); - if (MapUtils.isNotEmpty(errors)) { // there is some fishing operations with some errors @@ -283,6 +329,13 @@ } } + protected void increments(ProgressionModel progressionModel, + String message) { + if (progressionModel != null) { + progressionModel.increments(message); + } + } + protected void exportCruise(Cruise cruise, ExportContext exportContext, ProgressionModel progressionModel) { @@ -300,51 +353,42 @@ } String cruiseName = cruise.getName(); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportSurvey", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportSurvey", cruiseName)); exportSurvey(exportContext, cruise); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportGearCaracteristics", cruiseName)); exportGearCaracteristics(exportContext, cruise); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportOperations", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportOperations", cruiseName)); exportOperations(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportParameters", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportParameters", cruiseName)); exportParameters(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportMarineLitters", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportMarineLitters", cruiseName)); exportMarineLitters(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportIndividualObservations", cruiseName)); exportIndividualObservations(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportAccidentalCatches", cruiseName)); exportAccidentalCatch(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportCatches", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportCatches", cruiseName)); exportCatches(exportContext, cruise, loadedOperations); - progressionModel.increments(1); - progressionModel.setMessage( - _("tutti.service.exportCruise.exportSpecies", cruiseName)); + increments(progressionModel, + _("tutti.service.exportCruise.exportSpecies", cruiseName)); + exportSpecies(exportContext, exportContext.getSpeciesToExport()); - exportSpecies(exportContext, exportContext.getSpeciesToExport()); - progressionModel.increments(1); } protected void exportSurvey(ExportContext exportContext, @@ -444,7 +488,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.marineLitters.error"), e); } } @@ -470,7 +514,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.individualObservations.error"), e); } } @@ -489,7 +533,7 @@ } } catch (Exception e) { - throw new ApplicationTechnicalException(_("tutti.service.export.parameters.error"), e); + throw new ApplicationTechnicalException(_("tutti.service.export.accidentalCatch.error"), e); } } @@ -593,7 +637,7 @@ } catch (Exception e) { throw new ApplicationTechnicalException( - _("tutti.service.export.catches.error"), e); + _("tutti.service.export.species.error"), e); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportModel.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,8 +25,6 @@ */ -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; - import java.io.File; import java.io.Serializable; @@ -43,17 +41,19 @@ /** Report to use. */ protected File report; - /** Input data file. */ - protected File inputFile; + /** + * Selected cruise id (of fishing operation). + */ + protected String cruiseId; + /** + * Selected fishing operation to report. + */ + protected String fishingOperationId; + /** Where to generate the report. */ protected File outputFile; - /** - * Selected - */ - protected FishingOperation fishingOperation; - public File getReport() { return report; } @@ -62,14 +62,22 @@ this.report = report; } - public File getInputFile() { - return inputFile; + public String getCruiseId() { + return cruiseId; } - public void setInputFile(File inputFile) { - this.inputFile = inputFile; + public void setCruiseId(String cruiseId) { + this.cruiseId = cruiseId; } + public String getFishingOperationId() { + return fishingOperationId; + } + + public void setFishingOperationId(String fishingOperationId) { + this.fishingOperationId = fishingOperationId; + } + public File getOutputFile() { return outputFile; } @@ -77,12 +85,4 @@ public void setOutputFile(File outputFile) { this.outputFile = outputFile; } - - public FishingOperation getFishingOperation() { - return fishingOperation; - } - - public void setFishingOperation(FishingOperation fishingOperation) { - this.fishingOperation = fishingOperation; - } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -27,10 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.shared.application.ApplicationTechnicalException; +import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.AbstractTuttiService; +import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiServiceContext; +import fr.ifremer.tutti.service.export.generic.TuttiExportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.birt.core.exception.BirtException; @@ -54,6 +57,8 @@ import java.util.Map; import java.util.logging.Level; +import static org.nuiton.i18n.I18n._; + /** * To generate some reports. * @@ -83,6 +88,48 @@ protected EngineConfig engineConfig; + protected static class ReportContext { + + /** + * Incoming reportm model. + */ + final ReportModel model; + + /** + * Selected fishing operation. + */ + final FishingOperation fishingOperation; + + /** + * Where export is exploded. + */ + final File exportDirectory; + + public ReportContext(ReportModel model, + FishingOperation fishingOperation, + File exportFileDirectory) { + this.model = model; + this.fishingOperation = fishingOperation; + this.exportDirectory = exportFileDirectory; + } + + public File getExportDirectory() { + return exportDirectory; + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public File getReport() { + return model.getReport(); + } + + public File getOutputFile() { + return model.getOutputFile(); + } + } + @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); @@ -91,7 +138,7 @@ engineConfig = new EngineConfig(); engineConfig.setBIRTHome(context.getConfig().getReportHomeDirectory().getAbsolutePath()); engineConfig.setResourcePath(context.getConfig().getReportHomeDirectory().getAbsolutePath()); - engineConfig.setLogConfig(null, Level.FINE); + engineConfig.setLogConfig(context.getConfig().getReportLogFile().getAbsolutePath(), Level.FINE); // Get the instance of the engine try { @@ -102,8 +149,6 @@ factory = (IReportEngineFactory) Platform.createFactoryObject( IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY); - - } public ReportModel createModel() { @@ -114,45 +159,57 @@ return model; } - public void generateReport(ReportModel model) { + public void generateReport(ReportModel model, + ProgressionModel progressionModel) { Preconditions.checkNotNull(model); - Preconditions.checkNotNull(model.getFishingOperation()); Preconditions.checkNotNull(model.getReport()); - Preconditions.checkNotNull(model.getInputFile()); + Preconditions.checkState(model.getReport().exists()); + Preconditions.checkNotNull(model.getCruiseId()); + Preconditions.checkNotNull(model.getFishingOperationId()); Preconditions.checkNotNull(model.getOutputFile()); - Preconditions.checkState(model.getReport().exists()); - Preconditions.checkState(model.getInputFile().exists()); + // load fishing operation + progressionModel.increments(_("tutti.report.step.load.fishingOperation")); + FishingOperation operation = getService(PersistenceService.class). + getFishingOperation(model.getFishingOperationId()); + + // export fishing operation + progressionModel.increments(_("tutti.report.step.export.fishingOperation")); + File exportDirectory = getService(TuttiExportService.class). + exportCruiseToFileSystem(model.getCruiseId()); + + ReportContext reportContext = new ReportContext(model, + operation, + exportDirectory); + + generateReport(reportContext, progressionModel); + } + + protected void generateReport(ReportContext reportContext, + ProgressionModel progressionModel) { + + Preconditions.checkNotNull(reportContext.getFishingOperation()); + Preconditions.checkNotNull(reportContext.getExportDirectory()); + Preconditions.checkState(reportContext.getExportDirectory().exists()); + // explode input zip file - File dataDirectory = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - model.getInputFile(), - "Could not explode data zip file"); - // get all directories of exploded archive - File[] directories = dataDirectory.listFiles(new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.isDirectory(); - } - }); - // should have a unique directory - Preconditions.checkState(directories.length == 1, - "Archive should contains a unique directory"); - dataDirectory = directories[0]; + File dataDirectory = reportContext.getExportDirectory(); if (log.isInfoEnabled()) { log.info("Will generate report using report " + - model.getReport().getName()); + reportContext.getReport().getName()); } + progressionModel.increments(_("tutti.report.step.generateReport", reportContext.getReport().getName())); + IReportEngine engine = factory.createReportEngine(engineConfig); try { // Get the report document IReportRunnable rptDoc = - engine.openReportDesign(model.getReport().getAbsolutePath()); + engine.openReportDesign(reportContext.getReport().getAbsolutePath()); // Report context Map<String, Object> context = Maps.newHashMap(); @@ -166,7 +223,7 @@ // Configure the render options IRenderOption renderOption = new RenderOption(); - renderOption.setOutputFileName(model.getOutputFile().getAbsolutePath()); + renderOption.setOutputFileName(reportContext.getOutputFile().getAbsolutePath()); renderOption.setOutputFormat(IRenderOption.OUTPUT_FORMAT_PDF); // Create the render task @@ -174,8 +231,8 @@ task.setRenderOption(renderOption); task.setAppContext(context); task.setParameterValue("rpt-param_dirfile", dataDirectory.getAbsolutePath()); - task.setParameterValue("rpt-param_codestation", model.getFishingOperation().getStationNumber()); - task.setParameterValue("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); + task.setParameterValue("rpt-param_codestation", reportContext.getFishingOperation().getStationNumber()); + task.setParameterValue("rpt-param_numerotrait", reportContext.getFishingOperation().getFishingOperationNumber()); // render task.run(); @@ -184,7 +241,7 @@ task.close(); if (log.isInfoEnabled()) { - log.info("Report generated at " + model.getOutputFile()); + log.info("Report generated at " + reportContext.getOutputFile()); } } catch (Exception e) { Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -64,18 +64,25 @@ tutti.propety.no.vessel.name= tutti.propety.no.zone= tutti.propety.vessel.nation.registrationCode= +tutti.report.step.export.fishingOperation= +tutti.report.step.generateReport= +tutti.report.step.load.fishingOperation= tutti.service.compressZipFile.error= tutti.service.context.serviceInstanciation.error= tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= tutti.service.cvs.mandatory.value= +tutti.service.export.accidentalCatch.error= tutti.service.export.catches.error= tutti.service.export.closeContext.error= tutti.service.export.context.error= +tutti.service.export.individualObservations.error= tutti.service.export.invalid.cruise= tutti.service.export.invalid.fishingOperation= +tutti.service.export.marineLitters.error= tutti.service.export.operations.error= tutti.service.export.parameters.error= +tutti.service.export.species.error= tutti.service.export.survey.error= tutti.service.export.zip.error= tutti.service.exportCruise.buildZip= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -64,18 +64,25 @@ tutti.propety.no.vessel.name=Nom inconnu tutti.propety.no.zone=Pas de zone tutti.propety.vessel.nation.registrationCode=%s (nat.) +tutti.report.step.export.fishingOperation=Exporter le trait sélectionné +tutti.report.step.generateReport=Générer le rapport +tutti.report.step.load.fishingOperation=Charger le trait sélectionné tutti.service.compressZipFile.error=Erreur lors de la compression du dossier %1s dans le fichier %2s tutti.service.context.serviceInstanciation.error=Erreur lors de l'instanciation du service %s tutti.service.csv.parse.entityNotFound=L'entité de type %1s avec la propriété %2s de valeur %3s n'a pas été trouvée tutti.service.cvs.format.error=Erreur lors du formatage de la valeur %s tutti.service.cvs.mandatory.value=Valeur obligatoire +tutti.service.export.accidentalCatch.error=Erreur lors de l'export des captures accidentelles tutti.service.export.catches.error=Erreur lors de l'export des captures tutti.service.export.closeContext.error=Erreur lors de la fermeture du contexte d'export tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export +tutti.service.export.individualObservations.error=Erreur lors de l'export des observations individuelles tutti.service.export.invalid.cruise=Erreur d'élévation de poids sur les traits de la campagne %s \:<ul>%s</ul> tutti.service.export.invalid.fishingOperation=<li>L'élévation des poids ne peut pas être réalisée sur le trait %s, pour la raison suivante \:<ul><li>%s</li></ul></li> +tutti.service.export.marineLitters.error=Erreur lors de l'export des macro-déchets tutti.service.export.operations.error=Erreur lors de l'export des traits tutti.service.export.parameters.error=Erreur lors de l'export des paramètres +tutti.service.export.species.error=Erreur lors de l'export des espèces tutti.service.export.survey.error=Erreur lors de l'export de la campagne tutti.service.export.zip.error=Erreur lors de la création du zip d'export %s tutti.service.exportCruise.buildZip=Création de l'archive de l'export (fichier %s) Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -3,9 +3,9 @@ import fr.ifremer.shared.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.FishingOperations; import fr.ifremer.tutti.service.ServiceDbResource; import fr.ifremer.tutti.service.TuttiServiceContext; -import fr.ifremer.tutti.service.export.generic.TuttiExportService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -53,21 +53,56 @@ dataContext = dbResource.loadContext(PROGRAM_ID, CRUISE_ID, 1, OPERATION_1_ID); service = serviceContext.getService(ReportService.class); - } @Test public void testGenerateReport() throws Exception { - // export campaign data - File exportFile = new File(dbResource.getConfig().getTmpDirectory(), "exportMEDITS-2013.zip"); + // copy report resources from class-path + File sourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "2013.12.05"); + File targetDirectory = dbResource.getConfig().getReportHomeDirectory(); if (log.isInfoEnabled()) { - log.info("Export to " + exportFile); + log.info("Prepare report birt home at " + targetDirectory); } + ApplicationIOUtil.copyDirectory(sourceDirectory, targetDirectory, "Could not copy report directory"); + + // get reports + List<File> availableReports = service.getAvailableReports(); + Assert.assertNotNull(availableReports); + Assert.assertFalse(availableReports.isEmpty()); + Assert.assertEquals(1, availableReports.size()); + + // get unique report file + File reportFileName = availableReports.get(0); + + ReportModel model = createReportModel(); + model.setReport(reportFileName); + model.setCruiseId(CRUISE_ID); + model.setFishingOperationId(OPERATION_1_ID); + + // report must NOT exist + Assert.assertFalse(model.getOutputFile().exists()); + ProgressionModel progressionModel = new ProgressionModel(); - progressionModel.setTotal(9); - dbResource.getServiceContext().getService(TuttiExportService.class).exportCruise(CRUISE_ID, exportFile, progressionModel); + progressionModel.setTotal(3); + FishingOperation fishingOperation = FishingOperations.newFishingOperation(); + fishingOperation.setId(OPERATION_1_ID); + fishingOperation.setFishingOperationNumber(53); + fishingOperation.setStationNumber("G101"); + + + + // generate report + service.generateReport(model, progressionModel); + + // report must exist + Assert.assertTrue(model.getOutputFile().exists()); + } + + @Test + public void testGenerateReportFromExport() throws Exception { + // copy report resources from class-path File sourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "2013.12.05"); File targetDirectory = dbResource.getConfig().getReportHomeDirectory(); @@ -76,7 +111,15 @@ } ApplicationIOUtil.copyDirectory(sourceDirectory, targetDirectory, "Could not copy report directory"); - ReportModel model = service.createModel(); + // copy export resources from class-path + File exportSourceDirectory = FileUtil.getFileFromPaths(new File("src"), "test", "resources", "report", "exportCruise"); + File exportTargetDirectory = dbResource.getConfig().newTempFile("exportCruise"); + if (log.isInfoEnabled()) { + log.info("Prepare export at " + exportTargetDirectory); + } + ApplicationIOUtil.copyDirectory(exportSourceDirectory, exportTargetDirectory, "Could not copy report directory"); + + // get reports List<File> availableReports = service.getAvailableReports(); Assert.assertNotNull(availableReports); Assert.assertFalse(availableReports.isEmpty()); @@ -84,18 +127,39 @@ // get unique report file File reportFileName = availableReports.get(0); + + ReportModel model = createReportModel(); model.setReport(reportFileName); - model.setInputFile(exportFile); + model.setCruiseId(CRUISE_ID); + model.setFishingOperationId(OPERATION_1_ID); - // set fishing operation - FishingOperation fishingOperation = dataContext.operations.get(0); - model.setFishingOperation(fishingOperation); + // report must NOT exist + Assert.assertFalse(model.getOutputFile().exists()); + ProgressionModel progressionModel = new ProgressionModel(); + progressionModel.setTotal(3); + + FishingOperation fishingOperation = FishingOperations.newFishingOperation(); + fishingOperation.setId(OPERATION_1_ID); + fishingOperation.setFishingOperationNumber(53); + fishingOperation.setStationNumber("G101"); + + ReportService.ReportContext reportContext = new ReportService.ReportContext( + model, + fishingOperation, + exportTargetDirectory + ); + // generate report - Assert.assertFalse(model.getOutputFile().exists()); - service.generateReport(model); + service.generateReport(reportContext, progressionModel); // report must exist Assert.assertTrue(model.getOutputFile().exists()); } + + public ReportModel createReportModel() { + ReportModel model = service.createModel(); + model.setOutputFile(new File(model.getOutputFile().getAbsolutePath()+"_"+System.nanoTime())); + return model; + } } Added: trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/accidentalCatch.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue Added: trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/catch.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,186 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;Taxon;Nom_scientifique;Commentaire;V_HV;Num_Ordre_V_HV_H2;Tot_V_HV;Ech_V_HV;Type_Volume_Poids_V_HV;Unite_Volume_Poids_V_HV;Class_Tri_;Num_Ordre_Class_Tri__H2;Tot_Class_Tri_;Ech_Class_Tri_;Type_Volume_Poids_Class_Tri_;Unite_Volume_Poids_Class_Tri_;Sexe;Num_Ordre_Sexe_H2;Tot_Sexe;Ech_Sexe;Type_Volume_Poids_Sexe;Unite_Volume_Poids_Sexe;Maturité;Num_Ordre_Maturité_H2;Tot_Maturité;Ech_Maturité;Type_Volume_Poids_Maturité;Unite_Volume_Poids_Maturité;Age;Num_Ordre_Age_H2;Tot_Age;Ech_Age;Type_Volume_Poids_Age;Unite_Volume_Poids_Age;Code_Longueur;Libelle_Longueur;Taille;NumOrdre_Taille_H2;Poids_Classe_Taille;Unite_Taille;Precision_Mesure;Nbr;Poids_Reference;Coef_Elev_Espece_Capture +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;1;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;2;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;3;;cm;0.5;2;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;|;Vrac;1;;;Poids;kg;NA;;;;;kg;UNK - Indéterminé;1;0.11;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;4;;cm;0.5;1;0.11;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;1;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;2;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;3;;cm;0.5;10;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;4;;cm;0.5;13;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;5;;cm;0.5;18;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;6;;cm;0.5;11;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;7;;cm;0.5;4;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;8;;cm;0.5;4;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;9;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;10;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;3;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Mâle;1;1.26;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;12;;cm;0.5;1;1.26;6.73393; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;1;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;2;;cm;0.5;2;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;3;;cm;0.5;3;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;4;;cm;0.5;7;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;5;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;6;;cm;0.5;6;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;7;;cm;0.5;5;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;8;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;9;;cm;0.5;9;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;10;;cm;0.5;5;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;11;;cm;0.5;4;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;12;;cm;0.5;2;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;13;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1689;Mullus barbatus;|;Vrac;2;;;Poids;kg;NA;;;;;kg;Femelle;2;1.685;;Poids;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;14;;cm;0.5;1;1.685;5.035461; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;1;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;2;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;3;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;4;;cm;0.5;4;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;5;;cm;0.5;12;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;6;;cm;0.5;9;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;7;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;8;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;9;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;10;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;11;;cm;0.5;2;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.0;12;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1698;Boops boops;;Vrac;3;15.95;2.23;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;13;;cm;0.5;1;2.23;20.606756; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;1;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;2;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.0;3;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;4;;cm;0.5;3;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;5;;cm;0.5;6;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;6;;cm;0.5;5;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;7;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;8;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;9;;cm;0.5;2;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;10;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;11;;cm;0.5;4;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;12;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1920;Eutrigla gurnardus;;Vrac;4;1.315;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.5;13;;cm;0.5;1;1.315;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;1;;cm;0.5;4;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;2;;cm;0.5;3;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;3;;cm;0.5;8;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;4;;cm;0.5;17;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;5;;cm;0.5;7;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;6;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;7;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;8;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1714;Pagellus acarne;;Vrac;5;3.22;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.0;9;;cm;0.5;1;3.22;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.5;1;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;2;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;3;;cm;0.5;2;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;4;;cm;0.5;3;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.5;5;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;6;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Vrac;6;0.3;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;7;;cm;0.5;1;0.3;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;1;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;2;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;3;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;4;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.0;5;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;12.5;6;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.0;7;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;13.5;8;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;9;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;10;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;4;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;12;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;13;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;14;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;15;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.0;16;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.5;17;;cm;0.5;5;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;18;;cm;0.5;5;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.5;19;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.0;20;;cm;0.5;4;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;21.5;21;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.0;22;;cm;0.5;3;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;22.5;23;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.0;24;;cm;0.5;2;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;23.5;25;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;24.0;26;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;24.5;27;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;25.5;28;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1663;Trachurus mediterraneus;;Vrac;7;3.715;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;26.0;29;;cm;0.5;1;3.715;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;6.5;1;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.0;2;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.5;3;;cm;0.5;4;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.0;4;;cm;0.5;9;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.5;5;;cm;0.5;6;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;6;;cm;0.5;6;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;7;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;8;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;14.0;9;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;10;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;11;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;12;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;13;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1662;Trachurus trachurus;;Vrac;8;0.44;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;14;;cm;0.5;1;0.44;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1899;Scorpaena notata;;Vrac;17;0.13;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;3;0.13;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1629;Serranus hepatus;;Vrac;18;0.435;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;32;0.435;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;491;Alloteuthis;;Vrac;19;0.14;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;17;0.14;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1356;Sprattus sprattus;;Vrac;20;0.925;0.18;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;30;0.18;14.805499; +2013;MEDITS;;GOC73;G101;53;1;;1971;Arnoglossus laterna;;Vrac;21;0.055;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;13;0.055;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1791;Lesueurigobius friesii;;Vrac;22;0.125;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.125;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1785;Gobius niger;;Vrac;23;0.13;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;8;0.13;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1917;Lepidotrigla cavillone;;Vrac;24;0.03;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.03;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;2004;Buglossidium luteum;;Vrac;25;0.02;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.02;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;1812;Callionymus maculatus;;Vrac;26;0.004;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.004;2.8810701; +2013;MEDITS;;GOC73;G101;53;1;;468;Sepia elegans;;Vrac;27;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.012;2.8810704; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;15.5;1;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.0;2;;cm;0.5;3;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;16.5;3;;cm;0.5;6;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.0;4;;cm;0.5;3;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;17.5;5;;cm;0.5;2;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.0;6;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;18.5;7;;cm;0.5;5;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;19.5;8;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.0;9;;cm;0.5;2;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;M - Moyen;1;2.7;1.545;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;20.5;10;;cm;0.5;1;1.545;7.198014; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;7.5;1;;cm;0.5;1;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.0;2;;cm;0.5;9;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;8.5;3;;cm;0.5;9;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.0;4;;cm;0.5;4;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;9.5;5;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.0;6;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;10.5;7;;cm;0.5;2;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1558;Trisopterus minutus;|;Vrac;28;;;Poids;kg;P - Petit;2;1.16;0.21;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;307;Longueur totale (LT) - individu - totale - Mesure au 1/2 cm par un observateur;11.0;8;;cm;0.5;1;0.21;52.956814; +2013;MEDITS;;GOC73;G101;53;1;;1540;Merluccius merluccius;;Hors Vrac;1;;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.445;1.0; +2013;MEDITS;;GOC73;G101;53;1;;2049;Lophius piscatorius;;Hors Vrac;2;;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;1.175;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1704;Diplodus vulgaris;;Hors Vrac;3;2.25;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;2.25;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1713;Pagellus erythrinus;;Hors Vrac;4;0.76;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.76;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1996;Solea solea;;Hors Vrac;5;1.35;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;1.35;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1723;Spicara maena;;Hors Vrac;6;0.02;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.02;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1922;Trigloporus lastoviza;;Hors Vrac;7;0.04;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.04;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1818;Blennius ocellaris;;Hors Vrac;8;0.015;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.015;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1628;Serranus cabrilla;;Hors Vrac;9;0.845;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;14;0.845;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1899;Scorpaena notata;;Hors Vrac;10;0.995;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;22;0.995;1.0; +2013;MEDITS;;GOC73;G101;53;1;;521;Eledone moschata;;Hors Vrac;11;0.23;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.23;1.0; +2013;MEDITS;;GOC73;G101;53;1;;514;Octopus vulgaris;;Hors Vrac;12;11.6;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;11.6;1.0; +2013;MEDITS;;GOC73;G101;53;1;;831;Squilla mantis;;Hors Vrac;13;0.037;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.037;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1896;Scorpaena porcus;;Hors Vrac;14;0.935;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;0.935;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1956;Scophthalmus rhombus;;Hors Vrac;15;1.14;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;1.14;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1467;Conger conger;;Hors Vrac;16;1.04;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;1.04;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1654;Cepola macrophthalma;;Hors Vrac;17;0.045;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.045;1.0; +2013;MEDITS;;GOC73;G101;53;1;;522;Eledone cirrhosa;;Hors Vrac;18;4.65;1.82;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;4.65;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1183;Ascidia mentula;;Vrac;1;0.033;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;5;0.033;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1182;Ascidiacea;;Vrac;2;0.102;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;7;0.102;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3005;Phallusia mammillata;;Vrac;3;0.005;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3037;Alcyonium;;Vrac;4;0.014;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.014;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4410;Nudibranchia;;Vrac;5;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;3;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1136;Macropodia rostrata;;Vrac;6;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1140;Medorippe lanata;;Vrac;7;0.011;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.011;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1128;Inachus dorsettensis;;Vrac;8;0.016;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;8;0.016;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;8;Suberites;;Vrac;9;0.076;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.076;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;989;Dardanus arrosor;;Vrac;10;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.012;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4378;Calliactis parasitica;;Vrac;11;0.012;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;4;0.012;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;7;Porifera;;Vrac;12;0.072;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.072;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;11181;Astropecten irregularis pentacanthus;;Vrac;13;0.137;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;20;0.137;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1067;Liocarcinus;;Vrac;14;0.076;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;5;0.076;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;2184;Ocnus planci;;Vrac;15;0.4;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;11;0.4;21.347397; +2013;MEDITS;;GOC73;G101;53;1;;994;Pagurus prideaux;;Vrac;16;0.36;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.36;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4626;Adamsia carciniopados;;Vrac;17;0.03;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;29;0.03;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;3007;Veretillum cynomorium;;Vrac;18;0.675;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;108;0.675;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;150;Annelida;;Vrac;19;1.1;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;40;1.1;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;4667;Nemertesia ramosa;;Vrac;20;0.002;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;;0.002;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;317;Philine aperta;;Vrac;21;0.003;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.003;21.347395; +2013;MEDITS;;GOC73;G101;53;1;;1184;Botryllus;;Hors Vrac;1;0.142;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;2;0.142;1.0; +2013;MEDITS;;GOC73;G101;53;1;;1158;Ophiothrix fragilis;;Hors Vrac;2;0.005;;Poids;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;NA;;;;;kg;;;;;;;;1;0.005;1.0; Added: trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/gearCaracteristics.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1 @@ +Annee;Serie;Serie_Partielle;Engin;Code_PMFM;Libelle_PMFM;Valeur Added: trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/individualObservation.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,31 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;BatchId;ReferenceTaxonId;ReferenceTaxonName;Commentaire;CaracteristicId;CaracteristicValue +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;307;11.5; +2013;MEDITS;;GOC73;G101;53;1;;100018;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;307;14.0; +2013;MEDITS;;GOC73;G101;53;1;;100019;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100020;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100021;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;220;0.11; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;307;15.5; +2013;MEDITS;;GOC73;G101;53;1;;100022;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;220;0.05; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;307;12.5; +2013;MEDITS;;GOC73;G101;53;1;;100023;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;220;0.05; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;307;15.0; +2013;MEDITS;;GOC73;G101;53;1;;100024;1540;Merluccius merluccius;;196;UNK - Indéterminé; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;220;0.395; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;1433;307; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;307;34.5; +2013;MEDITS;;GOC73;G101;53;1;;100025;1540;Merluccius merluccius;;196;Femelle; Added: trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/marineLitter.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,9 @@ +Annee;Serie;Serie_Partielle;Engin;Code_station;Numero_Trait;Poche;Navire;MarineLitterCategory;MarineLitterSizeCategory;Number;Weight;Commentaire +2013;MEDITS;;GOC73;G101;53;1;;L1b Bouteilles;X: UNK - catégorisation non réalisée;3;0.435;; +2013;MEDITS;;GOC73;G101;53;1;;L1c Emballages alimentaires;X: UNK - catégorisation non réalisée;12;0.12;; +2013;MEDITS;;GOC73;G101;53;1;;"L1e Objets en plastique dur - Caisse, récipients, tubes, cendrier, couvercles, etc.";X: UNK - catégorisation non réalisée;4;0.635;; +2013;MEDITS;;GOC73;G101;53;1;;L1g lignes de pêche;X: UNK - catégorisation non réalisée;1;1.7;; +2013;MEDITS;;GOC73;G101;53;1;;L2a Pneus;X: UNK - catégorisation non réalisée;1;3.1;; +2013;MEDITS;;GOC73;G101;53;1;;L3b Autres canettes alimentaires/emballages;X: UNK - catégorisation non réalisée;1;0.16;; +2013;MEDITS;;GOC73;G101;53;1;;L4c Pots en céramique;X: UNK - catégorisation non réalisée;1;0.13;; +2013;MEDITS;;GOC73;G101;53;1;;L8 AUTRES;X: UNK - catégorisation non réalisée;1;40.0;; Added: trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/operation.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,2 @@ +Annee;Serie;Serie_Partielle;Code_Station;Numero_Trait;Poche;Engin;Navire;DateDeb_Op;LatDeb;LongDeb;DateFin_Op;LatFin;LongFin;Duree;Strate;Sous-Strate;Localite;Validite_OP;Rectiligne;Distance;Ouv_Verticale;Ouv_Horizontale_Ailes;Ouv_Horizontale_Panneaux;Saisisseur;NavireAssocie;Commentaire;Poids_Total;Poids_Total_Calcule;Poids_Total_Vrac;Poids_Total_Vrac_Calcule;Poids_Total_HorsVrac;Poids_Total_HorsVrac_Calcule;Poids_Total_Non_Trie;Poids_Total_Non_Trie_Calcule;Poids_Total_Tremis;Poids_Total_Tremis_Calcule;Poids_Total_Carroussel;Poids_Total_Carroussel_Calcule;Poids_Total_Espece;Poids_Total_Espece_Calcule;Poids_Total_Espece_Vrac;Poids_Total_Espece_Vrac_Calcule;Poids_Total_Espece_Vrac_Trie;Poids_Total_Espece_Vrac_Trie_Calcule;Poids_Total_Espece_HorsVrac;Poids_Total_Espece_HorsVrac_Calcule;Poids_Total_Espece_Inerte_Trie;Poids_Total_Espece_Inerte_Trie_Calcule;Poids_Total_Espece_Vivant_non_detaille_trie;Poids_Total_Espece_Vivant_non_detaille_trie_Calcule;Poids_Total_Benthos;Poids_Total_Benthos_Calcule;Poids_Total_Benthos_Vrac;Poids_Total_Benthos_Vrac_Calcule;Poids_Total_Benthos_Vrac_Trie;Poids_Total_Benthos_Vrac_Trie_Calcule;Poids_Total_Benthos_HorsVrac;Poids_Total_Benthos_HorsVrac_Calcule;Poids_Total_Benthos_Inerte_Trie;Poids_Total_Benthos_Inerte_Trie_Calcule;Poids_Total_Benthos_Vivant_non_detaille_trie;Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule;Poids_Total_Macro_Dechet;Poids_Total_Macro_Dechet_Calcule +2013;MEDITS;;G101;53;1;GOC73;;13/06/2013 05:32:00;42.975418;3.095972;13/06/2013 06:01:00;42.450695;3.09375;29;NA;NA;NA;Y;N;2778.0;NA;NA;NA;Luisa METRAL;;;203.6;Y;61.05;Y;27.72;Y;114.8;N;;?;;?;65.34;Y;37.77;Y;37.767998;Y;27.57;Y;3.907;N;0.0;Y;23.43;Y;23.282;N;3.142;Y;0.147;Y;0.0;Y;0.0;Y;46.28;Y; Added: trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/parameter.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,8 @@ +Annee;Serie;Serie_Partielle;Code_station;Numero_Trait;Poche;Code_PMFM;Libelle_PMFm;Valeur +2013;MEDITS;;G101;53;1;826;Longueur des funes - opération - totale - Instrument de bord;220.0; +2013;MEDITS;;G101;53;1;905;Longueur d'un bras - engin - bras - Inconnue;100.0; +2013;MEDITS;;G101;53;1;833;Ouverture verticale (chalut ou drague) - opération - totale - Instrument de bord;1.8; +2013;MEDITS;;G101;53;1;828;Ouverture Horizontale aux pointes d'ailes - opération - totale - Instrument de bord;20.0; +2013;MEDITS;;G101;53;1;863;"Température - masse d'eau, eau brute - Fond début de pêche - Instrument de bord";13.9; +2013;MEDITS;;G101;53;1;862;"Température - masse d'eau, eau brute - Fond fin de pêche - Instrument de bord";13.8; +2013;MEDITS;;G101;53;1;173;"Profondeur fond - masse d'eau, eau brute - totale - Inconnue";31.5; Added: trunk/tutti-service/src/test/resources/report/exportCruise/species.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/species.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/species.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,59 @@ +Id;Code_Rubin;Nom Scientifique;Code campagne +7;MBPORIF;Porifera;; +8;SUBE;Suberites;; +150;MBANNEL;Annelida;; +317;PHILAPE;Philine aperta;; +468;SEPIELE;Sepia elegans;; +491;ALLO;Alloteuthis;; +514;OCTPVUL;Octopus vulgaris;; +521;ELEDMOS;Eledone moschata;; +522;ELEDCIR;Eledone cirrhosa;; +831;SQUIMAN;Squilla mantis;; +989;DARDARR;Dardanus arrosor;; +994;PAGUPRI;Pagurus prideaux;; +1067;LIOC;Liocarcinus;; +1128;INACDOR;Inachus dorsettensis;; +1136;MACRROS;Macropodia rostrata;; +1140;MEDOLAN;Medorippe lanata;; +1158;OPHOFRA;Ophiothrix fragilis;; +1182;CLASCID;Ascidiacea;; +1183;ASCDMEN;Ascidia mentula;; +1184;BOTR;Botryllus;; +1356;SPRASPR;Sprattus sprattus;; +1467;CONGCON;Conger conger;; +1540;MERLMER;Merluccius merluccius;; +1558;TRISMIN;Trisopterus minutus;; +1628;SERRCAB;Serranus cabrilla;; +1629;SERRHEP;Serranus hepatus;; +1654;CEPOMAC;Cepola macrophthalma;; +1662;TRACTRA;Trachurus trachurus;; +1663;TRACMED;Trachurus mediterraneus;; +1689;MULLBAR;Mullus barbatus;; +1698;BOOPBOO;Boops boops;; +1704;DIPDVUL;Diplodus vulgaris;; +1713;PAGEERY;Pagellus erythrinus;; +1714;PAGEACA;Pagellus acarne;; +1723;SPICMAE;Spicara maena;; +1785;GOBINIG;Gobius niger;; +1791;LESUFRI;Lesueurigobius friesii;; +1812;CALMMAC;Callionymus maculatus;; +1818;BLENOCE;Blennius ocellaris;; +1896;SCORPOR;Scorpaena porcus;; +1899;SCORNOT;Scorpaena notata;; +1917;LEPRCAV;Lepidotrigla cavillone;; +1920;EUTRGUR;Eutrigla gurnardus;; +1922;TRGPLAS;Trigloporus lastoviza;; +1956;SCOPRHO;Scophthalmus rhombus;; +1971;ARNOLAT;Arnoglossus laterna;; +1996;SOLESOL;Solea solea;; +2004;BUGLLUT;Buglossidium luteum;; +2049;LOPHPIS;Lophius piscatorius;; +2184;OCNUPLA;Ocnus planci;; +3005;PHLLMAM;Phallusia mammillata;; +3007;VERECYN;Veretillum cynomorium;; +3037;ALCY;Alcyonium;; +4378;CLLCPAR;Calliactis parasitica;; +4410;ORNUDIB;Nudibranchia;; +4626;ADAMCAR;Adamsia carciniopados;; +4667;NEMERAM;Nemertesia ramosa;; +11181;ASTPIRP;Astropecten irregularis pentacanthus;; Added: trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv =================================================================== --- trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv (rev 0) +++ trunk/tutti-service/src/test/resources/report/exportCruise/survey.csv 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,2 @@ +Annee;Serie;Serie_Partielle;Navire;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire +2013;MEDITS;;;FRA;MEDITS - Golfe du Lion / Corse;MEDITS_2013;;23/05/2013 00:00:00;Toulon;26/06/2013 00:00:00;Sète-Mole et canaux;Angélique JADAUD|Luisa METRAL;Luisa METRAL|Angélique JADAUD;; Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/pom.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -307,24 +307,6 @@ <goal>update-project-license</goal> <goal>add-third-party</goal> </goals> - <configuration> - <licenseMerges> - <licenseMerge>The Apache Software License, Version 2.0| - Apache License, Version 2.0 - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU LESSER GENERAL PUBLIC LICENSE - </licenseMerge> - <licenseMerge>General Public License (GPL)| - GNU Lesser General Public License - </licenseMerge> - <licenseMerge> - Common Development and Distribution License (CDDL) v1.0| - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 - </licenseMerge> - <licenseMerge>BSD License|BSD</licenseMerge> - </licenseMerges> - </configuration> </execution> </executions> </plugin> Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -7,17 +7,21 @@ # - BSD-style license # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 # - GNU General Public License - Version 2 with the class path exception # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) # - HSQLDB License +# - ICU License +# - Java HTML Tidy License # - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - MPL 1.1 +# - Mozilla Public License # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 @@ -26,8 +30,21 @@ # Please fill the missing licenses for dependencies : # # -#Tue Dec 03 12:02:44 CET 2013 +#Mon Dec 09 13:48:21 CET 2013 antlr--antlr--2.7.6=BSD License +batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 +batik--batik-bridge--1.6=The Apache Software License, Version 2.0 +batik--batik-css--1.6=The Apache Software License, Version 2.0 +batik--batik-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-ext--1.6=The Apache Software License, Version 2.0 +batik--batik-gvt--1.6=The Apache Software License, Version 2.0 +batik--batik-parser--1.6=The Apache Software License, Version 2.0 +batik--batik-script--1.6=The Apache Software License, Version 2.0 +batik--batik-svg-dom--1.6=The Apache Software License, Version 2.0 +batik--batik-svggen--1.6=The Apache Software License, Version 2.0 +batik--batik-transcoder--1.6=The Apache Software License, Version 2.0 +batik--batik-util--1.6=The Apache Software License, Version 2.0 +batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=Common Development and Distribution License (CDDL) v1.0 Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-12-09 13:51:06 UTC (rev 1436) @@ -4,7 +4,7 @@ cd /d %~dp0% echo lauch java -%JAVA_COMMAND% -Xmx1024M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% -Xmx1024M -XX:MaxPermSize=256m -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% echo Stop Tutti with exitcode: %exitcode% cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,6 +1,6 @@ #!/bin/bash -MEMORY="-Xmx1024M" +MEMORY="-Xmx1024M -XX:MaxPermSize=256m" #TUTTI_JVM_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" REP=$(dirname $0) Deleted: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,368 +0,0 @@ -#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Nov 11 09:59:58 CET 2013 -tutti.config.help=config.html -tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets -tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot -tutti.dbManager.action.closeDb.help=dbManager.html\#actions -tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tutti.dbManager.action.exportDb.help=dbManager.html\#actions -tutti.dbManager.action.importDb.help=dbManager.html\#actions -tutti.dbManager.action.installDb.help=dbManager.html\#actions -tutti.dbManager.action.openDb.help=dbManager.html\#actions -tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions -tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions -tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.reset.help= -tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos -tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.help=editFishingOperation.html\#captureResume -tutti.editCruise.action.close.help=editCruise.html\#actions -tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions -tutti.editCruise.action.generateName.help=editCruise.html\#actions -tutti.editCruise.action.save.help=editCruise.html\#actions -tutti.editCruise.action.viewGearCaracteristics.help= -tutti.editCruise.field.beginDate.help=editCruise.html\#fields -tutti.editCruise.field.comment.help=editCruise.html\#fields -tutti.editCruise.field.country.help=editCruise.html\#fields -tutti.editCruise.field.departureLocation.help=editCruise.html\#fields -tutti.editCruise.field.endDate.help=editCruise.html\#fields -tutti.editCruise.field.gear.help=editCruise.html\#fields -tutti.editCruise.field.headOfMission.help=editCruise.html\#fields -tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields -tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields -tutti.editCruise.field.name.help=editCruise.html\#fields -tutti.editCruise.field.program.help=editCruise.html\#fields -tutti.editCruise.field.returnLocation.help=editCruise.html\#fields -tutti.editCruise.field.surveyPart.help=editCruise.html\#fields -tutti.editCruise.field.vessel.help=editCruise.html\#fields -tutti.editCruise.field.year.help=editCruise.html\#fields -tutti.editCruise.filterVessel.help=editCruise.html\#fields -tutti.editCruise.help=editCruise.html -tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.secondaryVessel.help= -tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.filterSecondaryVesselType.help= -tutti.editFishingOperation.help=editFishingOperation.html\#traitFields -tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions -tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.description.help=editProgram.html\#fields -tutti.editProgram.field.name.help=editProgram.html\#fields -tutti.editProgram.field.zone.help=editProgram.html\#fields -tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos -tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics -tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.help=editSampleCategory.html -tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= -tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields -tutti.fishingOperations.help=editFishingOperation.html -tutti.index.help=index.html -tutti.main.action.changeLocale.help=menu.html\#menu_aide -tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.action.showHelp.help=menu.html\#menu_aide -tutti.main.help=index.html -tutti.main.menu.action.about.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration -tutti.main.menu.action.editCatches.help=menu.html\#menu_action -tutti.main.menu.action.editCruise.help=menu.html\#menu_action -tutti.main.menu.action.editProgram.help=menu.html\#menu_action -tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= -tutti.main.menu.action.exit.help=menu.html\#menu_fichier -tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration -tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier -tutti.main.menu.action.report.help= -tutti.main.menu.action.selectCruise.help=menu.html\#menu_action -tutti.main.menu.action.showHelp.help=menu.html\#menu_aide -tutti.main.menu.action.site.help=menu.html\#menu_aide -tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier -tutti.main.menu.action.updateReport.help= -tutti.main.menu.action.validateCatches.help=menu.html\#menu_action -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.report.action.cancel.help= -tutti.report.action.chooseInputFile.help= -tutti.report.action.chooseOutputFile.help= -tutti.report.action.generate.help= -tutti.report.action.showOutputFile.help= -tutti.report.field.inputFile.help= -tutti.report.field.outputFile.help= -tutti.report.field.report.help= -tutti.report.help= -tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions -tutti.selectCruise.field.cruise.help=selectCruise.html\#fields -tutti.selectCruise.field.program.help=selectCruise.html\#fields -tutti.selectCruise.field.protocol.help=selectCruise.html\#fields -tutti.selectCruise.help=selectCruise.html -tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Deleted: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1,368 +0,0 @@ -#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Nov 11 09:59:58 CET 2013 -tutti.config.help=config.html -tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields -tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields -tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields -tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets -tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions -tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields -tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot -tutti.dbManager.action.closeDb.help=dbManager.html\#actions -tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions -tutti.dbManager.action.exportDb.help=dbManager.html\#actions -tutti.dbManager.action.importDb.help=dbManager.html\#actions -tutti.dbManager.action.installDb.help=dbManager.html\#actions -tutti.dbManager.action.openDb.help=dbManager.html\#actions -tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions -tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions -tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions -tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles -tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.reset.help= -tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions -tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields -tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos -tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions -tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields -tutti.editCatchBatch.help=editFishingOperation.html\#captureResume -tutti.editCruise.action.close.help=editCruise.html\#actions -tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions -tutti.editCruise.action.generateName.help=editCruise.html\#actions -tutti.editCruise.action.save.help=editCruise.html\#actions -tutti.editCruise.action.viewGearCaracteristics.help= -tutti.editCruise.field.beginDate.help=editCruise.html\#fields -tutti.editCruise.field.comment.help=editCruise.html\#fields -tutti.editCruise.field.country.help=editCruise.html\#fields -tutti.editCruise.field.departureLocation.help=editCruise.html\#fields -tutti.editCruise.field.endDate.help=editCruise.html\#fields -tutti.editCruise.field.gear.help=editCruise.html\#fields -tutti.editCruise.field.headOfMission.help=editCruise.html\#fields -tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields -tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields -tutti.editCruise.field.name.help=editCruise.html\#fields -tutti.editCruise.field.program.help=editCruise.html\#fields -tutti.editCruise.field.returnLocation.help=editCruise.html\#fields -tutti.editCruise.field.surveyPart.help=editCruise.html\#fields -tutti.editCruise.field.vessel.help=editCruise.html\#fields -tutti.editCruise.field.year.help=editCruise.html\#fields -tutti.editCruise.filterVessel.help=editCruise.html\#fields -tutti.editCruise.help=editCruise.html -tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions -tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.secondaryVessel.help= -tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields -tutti.editFishingOperation.filterSecondaryVesselType.help= -tutti.editFishingOperation.help=editFishingOperation.html\#traitFields -tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions -tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles -tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions -tutti.editProgram.action.saveProgram.help=editProgram.html\#actions -tutti.editProgram.field.description.help=editProgram.html\#fields -tutti.editProgram.field.name.help=editProgram.html\#fields -tutti.editProgram.field.zone.help=editProgram.html\#fields -tutti.editProgram.help=editProgram.html -tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics -tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions -tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos -tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies -tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos -tutti.editProtocol.field.comment.help=editProtocol.html\#fields -tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.field.name.help=editProtocol.html\#fields -tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies -tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics -tutti.editProtocol.help=editProtocol.html -tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics -tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions -tutti.editSampleCategoryModel.help=editSampleCategory.html -tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions -tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields -tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help= -tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions -tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields -tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration -tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions -tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields -tutti.fishingOperations.help=editFishingOperation.html -tutti.index.help=index.html -tutti.main.action.changeLocale.help=menu.html\#menu_aide -tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.action.showHelp.help=menu.html\#menu_aide -tutti.main.help=index.html -tutti.main.menu.action.about.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide -tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide -tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration -tutti.main.menu.action.editCatches.help=menu.html\#menu_action -tutti.main.menu.action.editCruise.help=menu.html\#menu_action -tutti.main.menu.action.editProgram.help=menu.html\#menu_action -tutti.main.menu.action.editProtocol.help=menu.html\#menu_action -tutti.main.menu.action.editSampleCategoryModel.help= -tutti.main.menu.action.exit.help=menu.html\#menu_fichier -tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration -tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier -tutti.main.menu.action.report.help= -tutti.main.menu.action.selectCruise.help=menu.html\#menu_action -tutti.main.menu.action.showHelp.help=menu.html\#menu_aide -tutti.main.menu.action.site.help=menu.html\#menu_aide -tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier -tutti.main.menu.action.updateReport.help= -tutti.main.menu.action.validateCatches.help=menu.html\#menu_action -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel -tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel -tutti.report.action.cancel.help= -tutti.report.action.chooseInputFile.help= -tutti.report.action.chooseOutputFile.help= -tutti.report.action.generate.help= -tutti.report.action.showOutputFile.help= -tutti.report.field.inputFile.help= -tutti.report.field.outputFile.help= -tutti.report.field.report.help= -tutti.report.help= -tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions -tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions -tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions -tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions -tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions -tutti.selectCruise.field.cruise.help=selectCruise.html\#fields -tutti.selectCruise.field.program.help=selectCruise.html\#fields -tutti.selectCruise.field.protocol.help=selectCruise.html\#fields -tutti.selectCruise.help=selectCruise.html -tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions -tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields -tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos -tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions -tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields -tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Copied: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties (from rev 1432, trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties) =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -0,0 +1,368 @@ +#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo +#Sun Dec 08 10:30:36 CET 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.action.saveAndContinue.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalGender.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSize.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalSpecies.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.field.accidentalWeight.help=editFishingOperation.html\#captureCapturesAccidentellesFields +tutti.createAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.createBenthosBatch.action.addSpecies.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.createBenthosBatch.field.batchCount.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.batchWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.field.species.help=editFishingOperation.html\#captureBenthosFields +tutti.createBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.createIndividualObservationBatch.action.addSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.cancel.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndClose.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.action.saveAndContinue.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.createIndividualObservationBatch.field.createFromBatch.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=editFishingOperation.html\#captureObservationsIndividuellesFields +tutti.createIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.createMarineLitterBatch.action.cancel.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndClose.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.action.saveAndContinue.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.marineLitterWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.number.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.field.weight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.createMarineLitterBatch.help=editFishingOperation.html\#captureMacroDechets +tutti.createSpeciesBatch.action.addSpecies.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndClose.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesCreeLotActions +tutti.createSpeciesBatch.field.batchCount.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.batchWeight.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.sortedUnsortedCategory.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.field.species.help=editFishingOperation.html\#captureEspecesCreeLotFields +tutti.createSpeciesBatch.help=editFishingOperation.html\#captureEspecesCreeLot +tutti.dbManager.action.closeDb.help=dbManager.html\#actions +tutti.dbManager.action.exportAndCleanDb.help=dbManager.html\#actions +tutti.dbManager.action.exportDb.help=dbManager.html\#actions +tutti.dbManager.action.importDb.help=dbManager.html\#actions +tutti.dbManager.action.installDb.help=dbManager.html\#actions +tutti.dbManager.action.openDb.help=dbManager.html\#actions +tutti.dbManager.action.reinstallDb.help=dbManager.html\#actions +tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions +tutti.dbManager.help=dbManager.html +tutti.editAccidentalBatch.action.createBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.exportMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.importMultiPost.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.action.removeBatch.help=editFishingOperation.html\#captureCapturesAccidentellesActions +tutti.editAccidentalBatch.help=editFishingOperation.html\#captureCapturesAccidentelles +tutti.editBenthosBatch.action.addSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.createMelag.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.editFrequencies.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.exportMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.importMultiPost.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.removeSubBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.renameBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.action.splitBatch.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosBatch.field.benthosTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.filterBatch.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.generate.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.reset.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureBenthosActions +tutti.editBenthosFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.maxStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.minStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.help=editFishingOperation.html\#captureBenthos +tutti.editCatchBatch.action.cancelEditCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.cleanWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.computeWeights.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReport.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.exportFishingOperationReportForSumatra.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.importPupitri.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.action.saveCatchBatch.help=editFishingOperation.html\#captureResumeActions +tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.benthosTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalRejectedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.catchTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureResumeFields +tutti.editCatchBatch.help=editFishingOperation.html\#captureResume +tutti.editCruise.action.close.help=editCruise.html\#actions +tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions +tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.save.help=editCruise.html\#actions +tutti.editCruise.action.viewGearCaracteristics.help= +tutti.editCruise.field.beginDate.help=editCruise.html\#fields +tutti.editCruise.field.comment.help=editCruise.html\#fields +tutti.editCruise.field.country.help=editCruise.html\#fields +tutti.editCruise.field.departureLocation.help=editCruise.html\#fields +tutti.editCruise.field.endDate.help=editCruise.html\#fields +tutti.editCruise.field.gear.help=editCruise.html\#fields +tutti.editCruise.field.headOfMission.help=editCruise.html\#fields +tutti.editCruise.field.headOfSortRoom.help=editCruise.html\#fields +tutti.editCruise.field.multirigNumber.help=editCruise.html\#fields +tutti.editCruise.field.name.help=editCruise.html\#fields +tutti.editCruise.field.program.help=editCruise.html\#fields +tutti.editCruise.field.returnLocation.help=editCruise.html\#fields +tutti.editCruise.field.surveyPart.help=editCruise.html\#fields +tutti.editCruise.field.vessel.help=editCruise.html\#fields +tutti.editCruise.field.year.help=editCruise.html\#fields +tutti.editCruise.filterVessel.help=editCruise.html\#fields +tutti.editCruise.help=editCruise.html +tutti.editFishingOperation.action.attachments.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.cancelEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.importCasino.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.resetFishingOperationValidState.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.action.saveEditFishingOperation.help=editFishingOperation.html\#traitActions +tutti.editFishingOperation.field.comment.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.duration.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationRectiligne.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.fishingOperationValid.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gear.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearDate.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEnd.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingEndLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStart.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLatitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearShootingStartLongitude.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.gearTime.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.location.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.multirigAggregation.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.recorderPerson.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.secondaryVessel.help= +tutti.editFishingOperation.field.stationNumber.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.strata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.subStrata.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#traitFields +tutti.editFishingOperation.filterSecondaryVesselType.help= +tutti.editFishingOperation.help=editFishingOperation.html\#traitFields +tutti.editIndividualObservationBatch.action.createBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.exportMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.importMultiPost.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeAllBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.action.removeBatch.help=editFishingOperation.html\#captureObservationsIndividuellesActions +tutti.editIndividualObservationBatch.help=editFishingOperation.html\#captureObservationsIndividuelles +tutti.editMarineLitterBatch.action.createBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.exportMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.importMultiPost.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.action.removeBatch.help=editFishingOperation.html\#captureMacroDechetsActions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editFishingOperation.html\#captureMacroDechetsFields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions +tutti.editProgram.action.saveProgram.help=editProgram.html\#actions +tutti.editProgram.field.description.help=editProgram.html\#fields +tutti.editProgram.field.name.help=editProgram.html\#fields +tutti.editProgram.field.zone.help=editProgram.html\#fields +tutti.editProgram.help=editProgram.html +tutti.editProtocol.action.addBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.addSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.closeEditProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.exportProtocolAllCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.exportProtocolCaracteristic.tip=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.exportProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.exportPupitri.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.importProtocolBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.importProtocolCaracteristic.help=editProtocol.html\#actionsCaracteristics +tutti.editProtocol.action.importProtocolSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.removeBenthosProtocol.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.removeSpeciesProtocol.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.action.saveProtocol.help=editProtocol.html\#actions +tutti.editProtocol.action.selectOtherBenthos.help=editProtocol.html\#actionsBenthos +tutti.editProtocol.action.selectOtherSpecies.help=editProtocol.html\#actionsSpecies +tutti.editProtocol.field.benthos.help=editProtocol.html\#fieldsBenthos +tutti.editProtocol.field.comment.help=editProtocol.html\#fields +tutti.editProtocol.field.gearUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.individualObservation.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.lengthClasses.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.field.name.help=editProtocol.html\#fields +tutti.editProtocol.field.species.help=editProtocol.html\#fieldsSpecies +tutti.editProtocol.field.vesselUseFeature.help=editProtocol.html\#fieldsCaracteristics +tutti.editProtocol.help=editProtocol.html +tutti.editProtocol.pane.caracteristic.help=editProtocol.html\#fieldsCaracteristics +tutti.editSampleCategoryModel.action.cancel.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.close.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveDownEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.moveUpEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.removeEntry.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.action.save.help=editSampleCategory.html\#actions +tutti.editSampleCategoryModel.help=editSampleCategory.html +tutti.editSpeciesBatch.action.addSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.changeSampleCategory.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.removeSubBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.renameBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.splitBatch.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.field.speciesTotalInertWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalUnsortedWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.field.speciesTotalWeight.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.filterSpeciesBatch.help=editFishingOperation.html\#captureEspecesFields +tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.reset.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.maxStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.minStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.autoGen.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.rafale.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.help=editFishingOperation.html\#captureEspecesMensuration +tutti.fishingOperations.action.deleteFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.action.newFishingOperation.help=editFishingOperation.html\#actions +tutti.fishingOperations.field.fishingOperation.help=editFishingOperation.html\#fields +tutti.fishingOperations.help=editFishingOperation.html +tutti.index.help=index.html +tutti.main.action.changeLocale.help=menu.html\#menu_aide +tutti.main.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.action.showHelp.help=menu.html\#menu_aide +tutti.main.help=index.html +tutti.main.menu.action.about.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocale.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleFR.help=menu.html\#menu_aide +tutti.main.menu.action.changeLocaleUK.help=menu.html\#menu_aide +tutti.main.menu.action.configuration.help=menu.html\#menu_fichier_configuration +tutti.main.menu.action.editCatches.help=menu.html\#menu_action +tutti.main.menu.action.editCruise.help=menu.html\#menu_action +tutti.main.menu.action.editProgram.help=menu.html\#menu_action +tutti.main.menu.action.editProtocol.help=menu.html\#menu_action +tutti.main.menu.action.editSampleCategoryModel.help= +tutti.main.menu.action.exit.help=menu.html\#menu_fichier +tutti.main.menu.action.generateCruiseReport.help=menu.html\#menu_action +tutti.main.menu.action.importTemporaryReferential.help=menu.html\#menu_administration +tutti.main.menu.action.manageDb.help=menu.html\#menu_fichier +tutti.main.menu.action.selectCruise.help=menu.html\#menu_action +tutti.main.menu.action.showHelp.help=menu.html\#menu_aide +tutti.main.menu.action.site.help=menu.html\#menu_aide +tutti.main.menu.action.updateApplication.help=menu.html\#menu_fichier +tutti.main.menu.action.updateReport.help= +tutti.main.menu.action.validateCatches.help=menu.html\#menu_action +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryGear.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryPerson.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporarySpecies.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.action.importTemporaryVessel.help=menu.html\#menu_administration_referentiel +tutti.manageTemporaryReferential.help=menu.html\#menu_administration_referentiel +tutti.report.action.cancel.help=report.html\#action +tutti.report.action.chooseOutputFile.help=report.html\#action +tutti.report.action.generate.help=report.html\#action +tutti.report.action.showOutputFile.help=report.html\#fields +tutti.report.field.fishingOperation.help=report.html\#fields +tutti.report.field.outputFile.help=report.html\#fields +tutti.report.field.report.help=report.html\#fields +tutti.report.help=report.html +tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruiseForSumatra.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.generateCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions +tutti.selectCruise.action.newProgram.help=selectCruise.html\#actions +tutti.selectCruise.action.newProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.sendCruiseReport.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCatches.help=selectCruise.html\#actions +tutti.selectCruise.action.validateCruise.help=selectCruise.html\#actions +tutti.selectCruise.field.cruise.help=selectCruise.html\#fields +tutti.selectCruise.field.program.help=selectCruise.html\#fields +tutti.selectCruise.field.protocol.help=selectCruise.html\#fields +tutti.selectCruise.help=selectCruise.html +tutti.splitBenthosBatch.action.cancel.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.action.save.help=editFishingOperation.html\#captureBenthosActions +tutti.splitBenthosBatch.field.batchWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.categoryField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.sampleWeightField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.field.speciesField.help=editFishingOperation.html\#captureBenthosFields +tutti.splitBenthosBatch.help=editFishingOperation.html\#captureBenthos +tutti.splitSpeciesBatch.action.cancel.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.action.save.help=editFishingOperation.html\#captureEspcesActions +tutti.splitSpeciesBatch.field.batchWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.categoryField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.sampleWeightField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.field.speciesField.help=editFishingOperation.html\#captureEspcesFields +tutti.splitSpeciesBatch.help=editFishingOperation.html\#captureEspces +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -455,8 +455,7 @@ _("tutti.help.mkDir.error", helpDirectory)); // load help mapping - String mappingProperties = - "/tutti-help-" + i18nLocale.getLanguage() + ".properties"; + String mappingProperties = "/tutti-help.properties"; try { InputStream resourceAsStream = Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/GenerateReportAction.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.report.ReportModel; import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.content.report.ReportUIHandler; @@ -60,8 +61,12 @@ public void doAction() throws Exception { Preconditions.checkState(getModel().isValid()); + ProgressionModel progressionModel = new ProgressionModel(); + setProgressionModel(progressionModel); + progressionModel.setTotal(4); // get data / export / generate ReportModel reportModel = getModel().toBean(); - getContext().getReportService().generateReport(reportModel); + getContext().getReportService().generateReport( + reportModel, progressionModel); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-12-09 13:51:06 UTC (rev 1436) @@ -62,16 +62,6 @@ _help: {"tutti.main.menu.action.editSampleCategoryModel.help"}; } -#menuFileReport { - actionIcon: report; - text: "tutti.main.action.report"; - toolTipText: "tutti.main.action.report.tip"; - i18nMnemonic: "tutti.main.action.report.mnemonic"; - enabled: {model.getScreen() != TuttiScreen.REPORT}; - _applicationAction: {fr.ifremer.tutti.ui.swing.action.ShowReportAction.class}; - _help: {"tutti.main.menu.action.report.help"}; -} - #menuFileExit { actionIcon: exit; text: "tutti.main.action.exit"; @@ -174,6 +164,16 @@ _help: {"tutti.main.menu.action.editCruise.help"}; } +#menuActionGenerateCruiseReport { + actionIcon: report; + text: "tutti.main.action.generateSelectedCruiseReport"; + toolTipText: "tutti.main.action.generateSelectedCruiseReport.tip"; + i18nMnemonic: "tutti.main.action.generateSelectedCruiseReport.mnemonic"; + enabled: {model.getScreen() != TuttiScreen.REPORT && model.isCruiseFilled()}; + _applicationAction: {fr.ifremer.tutti.ui.swing.action.ShowReportAction.class}; + _help: {"tutti.main.menu.action.generateSelectedCruiseReport.help"}; +} + #menuActionEditProtocol { actionIcon: protocol; text: "tutti.main.action.editSelectedProtocol"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-12-09 13:51:06 UTC (rev 1436) @@ -73,8 +73,6 @@ <JMenuItem id='menuFileUpdateReport'/> <JSeparator/> <JMenuItem id='menuFileManageDb'/> - <!--<JSeparator/>--> - <!--<JMenuItem id='menuFileReport'/>--> <JSeparator/> <JMenuItem id='menuFileExit'/> </JMenu> @@ -86,6 +84,7 @@ <JMenuItem id='menuActionEditProtocol'/> <JMenuItem id='menuActionEditCatches'/> <JMenuItem id='menuActionValidateCatches'/> + <JMenuItem id='menuActionGenerateCruiseReport'/> </JMenu> <JMenu id='menuAdministration'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -48,6 +48,7 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; +import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -443,12 +444,12 @@ icon = ui.getMenuActionValidateCatches().getIcon(); break; -// case REPORT: -// -// screenUI = new ReportUI(ui); -// screenTitle = _("tutti.report.title"); -// icon = ui.getMenuFileReport().getIcon(); -// break; + case REPORT: + + screenUI = new ReportUI(ui); + screenTitle = _("tutti.report.title"); + icon = ui.getMenuActionGenerateCruiseReport().getIcon(); + break; } JButton showHelp = ui.getShowHelp(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -221,6 +221,9 @@ .addOption(TuttiConfigurationOption.REPORT_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.service.report.directory.shortLabel")) + .addOption(TuttiConfigurationOption.REPORT_LOG_FILE) + .setOptionShortLabel(_("tutti.config.option.service.report.log.file.shortLabel")) + .addOption(TuttiConfigurationOption.DB_DIRECTORY) .setOptionShortLabel(_("tutti.config.option.persistence.db.directory.shortLabel")) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.css 2013-12-09 13:51:06 UTC (rev 1436) @@ -56,16 +56,17 @@ _validatorLabel: {_("tutti.report.field.report")}; } -#inputFileLabel { - text: "tutti.report.field.inputFile"; - labelFor: {inputFileField}; - toolTipText: "tutti.report.field.inputFile.tip"; - _help: {"tutti.report.field.inputFile.help"}; +#fishingOperationLabel { + text: "tutti.report.field.fishingOperation"; + labelFor: {fishingOperationComboBox}; + toolTipText: "tutti.report.field.fishingOperation.tip"; + _help: {"tutti.report.field.fishingOperation.help"}; } -#inputFileField { - selectedFile: {model.getInputFile()}; - _validatorLabel: {_("tutti.report.field.inputFile")}; +#fishingOperationComboBox { + property: fishingOperation; + selectedItem: {model.getFishingOperation()}; + _validatorLabel: {_("tutti.report.field.fishingOperation")}; } #outputFileLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx 2013-12-09 13:51:06 UTC (rev 1436) @@ -25,6 +25,8 @@ implements='fr.ifremer.tutti.ui.swing.util.TuttiUI<ReportUIModel, ReportUIHandler>'> <import> + fr.ifremer.tutti.persistence.entities.data.FishingOperation + fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil @@ -39,7 +41,6 @@ </import> <script><![CDATA[ - public ReportUI(TuttiUI parentUI) { TuttiUIUtil.setParentUI(this, parentUI); } @@ -52,15 +53,27 @@ <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <field name='fishingOperation' component='fishingOperationComboBox'/> <field name='report' component='reportComboBox'/> - <field name='inputFile' component='inputFileField'/> <field name='outputFile' component='outputFileField'/> </BeanValidator> <Table id='form' fill='both'> - <!-- report name --> + <!-- Select Fishing Operation (What) --> <row> + <cell> + <JLabel id='fishingOperationLabel'/> + </cell> + <cell> + <BeanFilterableComboBox id='fishingOperationComboBox' + constructorParams='this' + genericType='FishingOperation'/> + </cell> + </row> + + <!-- Select Report name (How) --> + <row> <cell anchor='west'> <JLabel id='reportLabel'/> </cell> @@ -70,20 +83,9 @@ </cell> </row> - <!-- input file --> + <!-- Output file (Where) --> <row> <cell> - <JLabel id='inputFileLabel'/> - </cell> - <cell> - <FileEditor id='inputFileField' - onActionPerformed='handler.setFile(event, "inputFile")'/> - </cell> - </row> - - <!-- output file --> - <row> - <cell> <JLabel id='outputFileLabel'/> </cell> <cell> @@ -99,7 +101,7 @@ </cell> </row> - <!-- actions --> + <!-- Actions --> <row anchor='south'> <cell columns='2'> <JPanel layout='{new GridLayout(1, 0)}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.shared.application.swing.util.CloseableUI; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -61,14 +62,21 @@ ReportService reportService = getContext().getReportService(); - getDataContext().resetValidationDataContext(); - ReportUIModel model = new ReportUIModel(); + // set cruiseId + String cruiseId = getDataContext().getCruiseId(); + model.setCruiseId(cruiseId); + // get all report availables List<File> reports = reportService.getAvailableReports(); model.setReports(reports); + // get all fishing operation + List<FishingOperation> fishingOperations = + getContext().getPersistenceService().getAllFishingOperation(cruiseId); + model.setFishingOperations(fishingOperations); + // get default output file name File outputFile = reportService.getDefaultOutputFile(); model.setOutputFile(outputFile); @@ -89,17 +97,15 @@ Lists.newArrayList(model.getReports()), model.getReport()); - FileEditor inputFileField = ui.getInputFileField(); - inputFileField.setDirectoryEnabled(false); - inputFileField.setFileEnabled(true); - inputFileField.setExts(".csv"); - inputFileField.setExtsDescription("Fichier csv"); + initBeanFilterableComboBox(ui.getFishingOperationComboBox(), + Lists.newArrayList(model.getFishingOperations()), + model.getFishingOperation()); FileEditor outputFileField = ui.getOutputFileField(); outputFileField.setDirectoryEnabled(false); outputFileField.setFileEnabled(true); outputFileField.setExts(".pdf"); - outputFileField.setExtsDescription("Fichier pdf"); + outputFileField.setExtsDescription(_("tutti.common.file.pdf")); SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); @@ -109,7 +115,7 @@ @Override protected JComponent getComponentToFocus() { - return getUI().getReportComboBox(); + return getUI().getFishingOperationComboBox(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java 2013-12-09 13:51:06 UTC (rev 1436) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; @@ -46,9 +47,10 @@ public static final String PROPERTY_REPORT = "report"; - public static final String PROPERTY_INPUT_FILE = "inputFile"; + public static final String PROPERTY_FISHING_OPERATION = "fishingOperationId"; public static final String PROPERTY_OUTPUT_FILE = "outputFile"; + public static final String PROPERTY_OUTPUT_FILE_EXISTS = "outputFileExists"; protected static Binder<ReportUIModel, ReportModel> toBeanBinder = @@ -57,8 +59,12 @@ protected List<File> reports; - protected final ReportModel editObject = new ReportModel(birtReportHome); + protected List<FishingOperation> fishingOperations; + protected final ReportModel editObject = new ReportModel(); + + protected FishingOperation fishingOperation; + public ReportUIModel() { super(null, toBeanBinder); } @@ -73,6 +79,14 @@ firePropertyChange(PROPERTY_REPORTS, oldValue, reports); } + public List<FishingOperation> getFishingOperations() { + return fishingOperations; + } + + public void setFishingOperations(List<FishingOperation> fishingOperations) { + this.fishingOperations = fishingOperations; + } + public File getReport() { return editObject.getReport(); } @@ -83,16 +97,28 @@ firePropertyChange(PROPERTY_REPORT, oldValue, report); } - public File getInputFile() { - return editObject.getInputFile(); + public String getCruiseId() { + return editObject.getCruiseId(); } - public void setInputFile(File inputFile) { - Object oldValue = getInputFile(); - editObject.setInputFile(inputFile); - firePropertyChange(PROPERTY_INPUT_FILE, oldValue, inputFile); + public void setCruiseId(String cruiseId) { + editObject.setCruiseId(cruiseId); } + public String getFishingOperationId() { + return fishingOperation == null ? null : fishingOperation.getId(); + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + public void setFishingOperation(FishingOperation fishingOperation) { + Object oldValue = this.fishingOperation; + this.fishingOperation = fishingOperation; + firePropertyChange(PROPERTY_FISHING_OPERATION, oldValue, fishingOperation); + } + public File getOutputFile() { return editObject.getOutputFile(); } @@ -108,12 +134,13 @@ firePropertyChange(PROPERTY_OUTPUT_FILE_EXISTS, null, isOutputFileExists()); } + public boolean isOutputFileExists() { return getOutputFile() != null && getOutputFile().exists(); } @Override protected ReportModel newEntity() { - return new ReportModel(birtReportHome); + return new ReportModel(); } } Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel-error-validation.xml 2013-12-09 13:51:06 UTC (rev 1436) @@ -32,12 +32,15 @@ </field-validator> </field> - <field name="inputFile"> + <field name="cruiseId"> <field-validator type="required" short-circuit="true"> - <message>tutti.validator.error.report.inputFile.required</message> + <message>tutti.validator.error.report.cruiseId.required</message> </field-validator> - <field-validator type="existingFile" short-circuit="true"> - <message>tutti.validator.error.report.inputFile.notExists</message> + </field> + + <field name="fishingOperation"> + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.report.fishingOperation.required</message> </field-validator> </field> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -1275,6 +1275,12 @@ tutti.main.action.exit= tutti.main.action.exit.mnemonic= tutti.main.action.exit.tip= +tutti.main.action.generateCruiseReport= +tutti.main.action.generateCruiseReport.mnemonic= +tutti.main.action.generateCruiseReport.tip= +tutti.main.action.generateSelectedCruiseReport= +tutti.main.action.generateSelectedCruiseReport.mnemonic= +tutti.main.action.generateSelectedCruiseReport.tip= tutti.main.action.goto.previousScreen.tip= tutti.main.action.importTemporaryReferential= tutti.main.action.importTemporaryReferential.mnemonic= @@ -1431,6 +1437,8 @@ tutti.report.action.showOutputFile= tutti.report.action.showOutputFile.mnemonic= tutti.report.action.showOutputFile.tip= +tutti.report.field.fishingOperation= +tutti.report.field.fishingOperation.tip= tutti.report.field.inputFile= tutti.report.field.inputFile.tip= tutti.report.field.outputFile= @@ -1465,6 +1473,8 @@ tutti.selectCruise.action.exportProgram.tip= tutti.selectCruise.action.exportProtocol= tutti.selectCruise.action.exportProtocol.tip= +tutti.selectCruise.action.generateCruiseReport= +tutti.selectCruise.action.generateCruiseReport.tip= tutti.selectCruise.action.importProtocol= tutti.selectCruise.action.importProtocol.tip= tutti.selectCruise.action.newCruise= @@ -1598,6 +1608,9 @@ tutti.validator.error.longitude.second.outOfBounds= tutti.validator.error.longitude.start.required= tutti.validator.error.program.zone.required= +tutti.validator.error.report.cruiseId.required= +tutti.validator.error.report.fishingOperation.required= +tutti.validator.error.report.fishingOperationId.required= tutti.validator.error.report.inputFile.notExists= tutti.validator.error.report.inputFile.required= tutti.validator.error.report.outputFile.required= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 06:27:39 UTC (rev 1435) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-12-09 13:51:06 UTC (rev 1436) @@ -131,6 +131,7 @@ tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.service.report.backup.directory.shortLabel=Répertoire des sauvegardes de rapport tutti.config.option.service.report.directory.shortLabel=Répertoire des modèles de rapport +tutti.config.option.service.report.log.file.shortLabel=Fichier de log de la génération des rapports tutti.config.option.site.url.shortLabel=URL du site technique tutti.config.option.startActionFile.description=Fichier tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire @@ -1262,6 +1263,9 @@ tutti.main.action.exit=Quitter tutti.main.action.exit.mnemonic=Q tutti.main.action.exit.tip=Quitter l'application +tutti.main.action.generateSelectedCruiseReport=Rapport +tutti.main.action.generateSelectedCruiseReport.mnemonic=R +tutti.main.action.generateSelectedCruiseReport.tip=Générer des rapports tutti.main.action.goto.previousScreen.tip=Retour à l'écran précédent tutti.main.action.importTemporaryReferential=Référentiels temporaires tutti.main.action.importTemporaryReferential.mnemonic=R @@ -1270,9 +1274,6 @@ tutti.main.action.manageDb.mnemonic=G tutti.main.action.manageDb.tip=Gérer la base de données utilisée par l'application tutti.main.action.reloadTutti=Redémarrer l'application -tutti.main.action.report=Rapport -tutti.main.action.report.mnemonic=R -tutti.main.action.report.tip=Générer des rapports tutti.main.action.selectCruise=Sélectionner une campagne tutti.main.action.selectCruise.mnemonic=S tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser @@ -1412,7 +1413,8 @@ tutti.report.action.showOutputFile=Voir tutti.report.action.showOutputFile.mnemonic=V tutti.report.action.showOutputFile.tip=Voir le rapport -tutti.report.field.inputFile=Fichier de données +tutti.report.field.fishingOperation=Trait +tutti.report.field.fishingOperation.tip=Sélectionner le trait tutti.report.field.inputFile.tip=Chemin vers le fichier de données tutti.report.field.outputFile=Rapport tutti.report.field.outputFile.tip=Chemin où générer le rapport @@ -1580,8 +1582,8 @@ tutti.validator.error.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 59 tutti.validator.error.longitude.start.required=La longitude de début de traîne est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire -tutti.validator.error.report.inputFile.notExists=Le fichier d'entrée n'eixste pas -tutti.validator.error.report.inputFile.required=Le fichier d'entrée est obligatoire +tutti.validator.error.report.cruiseId.required=La campagne est obligatoire +tutti.validator.error.report.fishingOperation.required=Un trait doit être sélectionné tutti.validator.error.report.outputFile.required=Le fichier de sortie est obligatoire tutti.validator.error.report.report.required=Un modèle de rapport doit être sélectionné tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required=La classe de taille est obligatoire