Author: tchemit Date: 2013-03-12 10:10:25 +0100 (Tue, 12 Mar 2013) New Revision: 581 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/581 Log: fixes #2120: [ERGO]Suppression du filtre sur les tableau fixes #1896: [TECH] - Gestion du multilinguisme fixes #1818: [CONF] - Choix de la langue de l'outil - add en_GB in i18n - generate i18n csv file - reformat code Added: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/help/en/ trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/dbManager.html trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/en/editCruise.html trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/en/editProgram.html trunk/tutti-ui-swing/src/main/help/en/editProtocol.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html trunk/tutti-ui-swing/src/main/help/en/main.html trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/en/selectCruise.html trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/ trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/dbManager.html trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/fr/editCruise.html trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/fr/editProgram.html trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html trunk/tutti-ui-swing/src/main/help/fr/main.html trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/icons/action-translate.png Removed: trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/dbManager.html trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html trunk/tutti-ui-swing/src/main/help/editCatchBatch.html trunk/tutti-ui-swing/src/main/help/editCruise.html trunk/tutti-ui-swing/src/main/help/editFishingOperation.html trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html trunk/tutti-ui-swing/src/main/help/editProgram.html trunk/tutti-ui-swing/src/main/help/editProtocol.html trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html trunk/tutti-ui-swing/src/main/help/fishingOperations.html trunk/tutti-ui-swing/src/main/help/main.html trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html trunk/tutti-ui-swing/src/main/help/selectCruise.html trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html Modified: trunk/ trunk/pom.xml trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 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/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.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/cruise/EditCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/ColumnIdentifier.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .idea *.ipr *.iws *.iml *.log *.bat + target .idea *.ipr *.iws *.iml *.log *.bat atlassian-ide-plugin.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/pom.xml 2013-03-12 09:10:25 UTC (rev 581) @@ -139,7 +139,7 @@ <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <i18n.bundles>fr_FR</i18n.bundles> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> <!-- locales for the site generation, by default only french --> @@ -289,11 +289,11 @@ <version>${swingXVersion}</version> </dependency> - <dependency> + <!--dependency> <groupId>com.ezware.oxbow</groupId> <artifactId>swing-bits</artifactId> <version>0.5.0</version> - </dependency> + </dependency--> <dependency> <groupId>commons-dbcp</groupId> Added: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties (rev 0) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,27 @@ +tutti.option.persistence.cache.directory.description= +tutti.option.persistence.db.attachment.directory.description= +tutti.option.persistence.db.configurationPath.description= +tutti.option.persistence.db.directory.description= +tutti.option.persistence.db.enumerationPath.description= +tutti.option.persistence.db.name.description= +tutti.option.persistence.hibernate.dialect.description= +tutti.option.persistence.hibernate.formatSql.description= +tutti.option.persistence.hibernate.showSql.description= +tutti.option.persistence.hibernate.useSqlComment.description= +tutti.option.persistence.jdbc.driver.description= +tutti.option.persistence.jdbc.password.description= +tutti.option.persistence.jdbc.url.description= +tutti.option.persistence.jdbc.username.description= +tutti.option.persistence.protocol.directory.description= +tutti.persistence.batch.validation.horsVracBenthosNotFound= +tutti.persistence.batch.validation.horsVracSpeciesNotFound= +tutti.persistence.batch.validation.onlySpeciesBatchStructure= +tutti.persistence.batch.validation.unsortedNotFound= +tutti.persistence.batch.validation.vracBenthosInertNotFound= +tutti.persistence.batch.validation.vracBenthosLifeNotFound= +tutti.persistence.batch.validation.vracBenthosNotFound= +tutti.persistence.batch.validation.vracNotFound= +tutti.persistence.batch.validation.vracSpeciesInertNotFound= +tutti.persistence.batch.validation.vracSpeciesLifeNotFound= +tutti.persistence.batch.validation.vracSpeciesNotFound= +tutti.persistence.config= Property changes on: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-03-12 09:10:25 UTC (rev 581) @@ -139,7 +139,6 @@ }; } - static { n_("tutti.property.protocol"); n_("tutti.property.label"); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2013-03-12 09:10:25 UTC (rev 581) @@ -103,6 +103,19 @@ } } + public <S extends TuttiService> S reloadService(Class<S> serviceType) { + S service = (S) services.getIfPresent(serviceType); + if (service != null) { + if (log.isInfoEnabled()) { + log.info("Close service " + service); + } + IOUtils.closeQuietly(service); + } + services.invalidate(serviceType); + S result = getService(serviceType); + return result; + } + @Override public void close() throws IOException { Added: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties (rev 0) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,47 @@ +tutti.option.basedir.description= +tutti.option.csv.separator.description= +tutti.option.data.directory.description= +tutti.option.inceptionYear.description= +tutti.option.organizationName.description= +tutti.option.site.url.description= +tutti.option.tmp.directory.description= +tutti.option.version.description= +tutti.property.attachment= +tutti.property.caracteristic= +tutti.property.country= +tutti.property.cruise= +tutti.property.date= +tutti.property.department= +tutti.property.firstName= +tutti.property.fishingOperation= +tutti.property.fishingOperationLocation= +tutti.property.fractionName= +tutti.property.gear= +tutti.property.genusSpecies= +tutti.property.internationalRegistrationCode= +tutti.property.label= +tutti.property.lastName= +tutti.property.macroWasteCategory= +tutti.property.matrixName= +tutti.property.methodName= +tutti.property.multirigAggregation= +tutti.property.name= +tutti.property.parameterName= +tutti.property.program= +tutti.property.protocol= +tutti.property.refTaxCode= +tutti.property.sortedUnsortedCategory= +tutti.property.species= +tutti.property.stationNumber= +tutti.property.strata= +tutti.property.surveyCode= +tutti.property.user= +tutti.property.vessel= +tutti.property.zone= +tutti.property.zoneLabel= +tutti.propety.no.species.refTaxCode= +tutti.propety.no.species.surveyCode= +tutti.propety.no.vessel.name= +tutti.propety.no.zone= +tutti.propety.vessel.nation.registrationCode= +tutti.service.config= Property changes on: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/pom.xml 2013-03-12 09:10:25 UTC (rev 581) @@ -54,7 +54,7 @@ <!-- jaxx help configuration --> <jaxx.helpsetName>tutti</jaxx.helpsetName> - <jaxx.locales>fr</jaxx.locales> + <jaxx.locales>fr,en</jaxx.locales> <jaxx.mergeIdsToInput>true</jaxx.mergeIdsToInput> <jaxx.inputHelpDirectory> src/main/filtered-resources @@ -65,6 +65,10 @@ </jaxx.helpBrokerFQN> <i18n.bundleOutputName>tutti-i18n</i18n.bundleOutputName> + <i18n.generateCsvFile>true</i18n.generateCsvFile> + <i18n.bundleCsvFile> + ${maven.gen.dir}/resources/META-INF/${i18n.bundleOutputName}.csv + </i18n.bundleCsvFile> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> @@ -358,10 +362,10 @@ <artifactId>swingx-autocomplete</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>com.ezware.oxbow</groupId> <artifactId>swing-bits</artifactId> - </dependency> + </dependency--> <!-- Logging --> Added: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,198 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo +#Tue Mar 12 09:29:29 CET 2013 +tuttihelp.createSpeciesBatch.action.addSpecies.help= +tuttihelp.createSpeciesBatch.field.batchWeightField.help= +tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help= +tuttihelp.createSpeciesBatch.field.speciesComboBox.help= +tuttihelp.createSpeciesBatch.help= +tuttihelp.dbManager.action.closeDb.help= +tuttihelp.dbManager.action.exportDb.help= +tuttihelp.dbManager.action.installDb.help= +tuttihelp.dbManager.action.openDb.help= +tuttihelp.dbManager.action.upgradeDb.help= +tuttihelp.dbManager.help= +tuttihelp.editAccidentalBatch.help= +tuttihelp.editBenthosBatch.help= +tuttihelp.editCatchBatch.action.cancelEditCatchBatch.help= +tuttihelp.editCatchBatch.action.computeWeights.help= +tuttihelp.editCatchBatch.action.importPupitri.help= +tuttihelp.editCatchBatch.action.saveCatchBatch.help= +tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.help= +tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.help= +tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.help= +tuttihelp.editCatchBatch.field.benthosTotalWeight.help= +tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.help= +tuttihelp.editCatchBatch.field.catchTotalSortedWeight.help= +tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.help= +tuttihelp.editCatchBatch.field.catchTotalWeight.help= +tuttihelp.editCatchBatch.field.macroWasteTotalWeight.help= +tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.help= +tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.help= +tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.help= +tuttihelp.editCatchBatch.field.speciesTotalWeight.help= +tuttihelp.editCatchBatch.help= +tuttihelp.editCruise.action.cancel.help= +tuttihelp.editCruise.action.generateName.help= +tuttihelp.editCruise.action.save.help= +tuttihelp.editCruise.field.beginDate.help= +tuttihelp.editCruise.field.comment.help= +tuttihelp.editCruise.field.country.help= +tuttihelp.editCruise.field.endDate.help= +tuttihelp.editCruise.field.multirigNumber.help= +tuttihelp.editCruise.field.name.help= +tuttihelp.editCruise.field.program.help= +tuttihelp.editCruise.field.surveyPart.help= +tuttihelp.editCruise.field.year.help= +tuttihelp.editCruise.filterVessel.help= +tuttihelp.editCruise.help= +tuttihelp.editCruise.list.gear.help= +tuttihelp.editCruise.list.headOfMission.help= +tuttihelp.editCruise.list.headOfSortRoom.help= +tuttihelp.editCruise.list.vessel.help= +tuttihelp.editFishingOperation.action.attachments.help= +tuttihelp.editFishingOperation.action.cancelEditFishingOperation.help= +tuttihelp.editFishingOperation.action.importCasino.help= +tuttihelp.editFishingOperation.action.saveEditFishingOperation.help= +tuttihelp.editFishingOperation.field.comment.help= +tuttihelp.editFishingOperation.field.duration.help= +tuttihelp.editFishingOperation.field.fishingOperationNumber.help= +tuttihelp.editFishingOperation.field.fishingOperationRectiligne.help= +tuttihelp.editFishingOperation.field.fishingOperationValid.help= +tuttihelp.editFishingOperation.field.gear.help= +tuttihelp.editFishingOperation.field.gearDate.help= +tuttihelp.editFishingOperation.field.gearLatitude.help= +tuttihelp.editFishingOperation.field.gearLongitude.help= +tuttihelp.editFishingOperation.field.gearShootingEnd.help= +tuttihelp.editFishingOperation.field.gearShootingEndLatitude.help= +tuttihelp.editFishingOperation.field.gearShootingEndLongitude.help= +tuttihelp.editFishingOperation.field.gearShootingStart.help= +tuttihelp.editFishingOperation.field.gearShootingStartLatitude.help= +tuttihelp.editFishingOperation.field.gearTime.help= +tuttihelp.editFishingOperation.field.location.help= +tuttihelp.editFishingOperation.field.multirigAggregation.help= +tuttihelp.editFishingOperation.field.stationNumber.help= +tuttihelp.editFishingOperation.field.strata.help= +tuttihelp.editFishingOperation.field.subStrata.help= +tuttihelp.editFishingOperation.field.trawlDistance.help= +tuttihelp.editFishingOperation.field.vessel.help= +tuttihelp.editFishingOperation.gearShootingStartLongitude.help= +tuttihelp.editFishingOperation.help= +tuttihelp.editFishingOperation.list.recorderPerson.help= +tuttihelp.editMacroWasteBatch.help= +tuttihelp.editPlanktonBatch.help= +tuttihelp.editProgram.action.cancelProgram.help= +tuttihelp.editProgram.action.saveProgram.help= +tuttihelp.editProgram.field.comment.help= +tuttihelp.editProgram.field.name.help= +tuttihelp.editProgram.field.zone.help= +tuttihelp.editProgram.help= +tuttihelp.editProtocol.action.addSpeciesProtocol.help= +tuttihelp.editProtocol.action.cancelEditProtocol.help= +tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.help= +tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip= +tuttihelp.editProtocol.action.exportProtocolSpecies.help= +tuttihelp.editProtocol.action.importProtocolCaracteristic.help= +tuttihelp.editProtocol.action.importProtocolSpecies.help= +tuttihelp.editProtocol.action.saveProtocol.help= +tuttihelp.editProtocol.action.selectOtherSpecies.help= +tuttihelp.editProtocol.field.comment.help= +tuttihelp.editProtocol.field.name.help= +tuttihelp.editProtocol.field.species.help= +tuttihelp.editProtocol.help= +tuttihelp.editProtocol.list.gearUseFeature.help= +tuttihelp.editProtocol.list.lengthClasses.help= +tuttihelp.editProtocol.list.vesselUseFeature.help= +tuttihelp.editProtocol.pane.caracteristic.help= +tuttihelp.editProtocol.table.species.help= +tuttihelp.editSpeciesBatch.action.createMelag.help= +tuttihelp.editSpeciesBatch.action.createSpeciesBatch.help= +tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.help= +tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.help= +tuttihelp.editSpeciesBatch.action.renameSpeciesBatch.help= +tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.help= +tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.help= +tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help= +tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.help= +tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.help= +tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.help= +tuttihelp.editSpeciesBatch.field.speciesTotalWeight.help= +tuttihelp.editSpeciesBatch.filterSpeciesBatch.help= +tuttihelp.editSpeciesBatch.help= +tuttihelp.editSpeciesFrequencies.help= +tuttihelp.fishingOperations.action.newFishingOperation.help= +tuttihelp.fishingOperations.field.fishingOperation.help= +tuttihelp.fishingOperations.help= +tuttihelp.main.action.changeLocale.help= +tuttihelp.main.action.changeLocaleFR.help= +tuttihelp.main.action.changeLocaleUK.help= +tuttihelp.main.action.showHelp.help= +tuttihelp.main.help= +tuttihelp.main.menu.action.about.help= +tuttihelp.main.menu.action.configuration.help= +tuttihelp.main.menu.action.editCatches.help= +tuttihelp.main.menu.action.editCruise.help= +tuttihelp.main.menu.action.editProgram.help= +tuttihelp.main.menu.action.editProtocol.help= +tuttihelp.main.menu.action.exit.help= +tuttihelp.main.menu.action.importTemporaryReferential.help= +tuttihelp.main.menu.action.manageDb.help= +tuttihelp.main.menu.action.selectCruise.help= +tuttihelp.main.menu.action.showHelp.help= +tuttihelp.main.menu.action.site.help= +tuttihelp.main.menu.action.updateApplication.help= +tuttihelp.main.menu.action.validateCatches.help= +tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.help= +tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.help= +tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.help= +tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.help= +tuttihelp.manageTemporaryReferential.action.importTemporaryGear.help= +tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.help= +tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.help= +tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.help= +tuttihelp.manageTemporaryReferential.help= +tuttihelp.selectCruise.action.cloneProtocol.help= +tuttihelp.selectCruise.action.deleteProtocol.help= +tuttihelp.selectCruise.action.editCatches.help= +tuttihelp.selectCruise.action.editCruise.help= +tuttihelp.selectCruise.action.editProgram.help= +tuttihelp.selectCruise.action.editProtocol.help= +tuttihelp.selectCruise.action.exportProtocol.help= +tuttihelp.selectCruise.action.importProtocol.help= +tuttihelp.selectCruise.action.newCruise.help= +tuttihelp.selectCruise.action.newProgram.help= +tuttihelp.selectCruise.action.newProtocol.help= +tuttihelp.selectCruise.action.validateCatches.help= +tuttihelp.selectCruise.field.cruise.help= +tuttihelp.selectCruise.field.program.help= +tuttihelp.selectCruise.field.protocol.help= +tuttihelp.selectCruise.help= +tuttihelp.splitSpeciesBatch.action.cancel.help= +tuttihelp.splitSpeciesBatch.action.save.help= +tuttihelp.splitSpeciesBatch.field.batchWeightField.help= +tuttihelp.splitSpeciesBatch.field.categoryField.help= +tuttihelp.splitSpeciesBatch.field.sampleWeightField.help= +tuttihelp.splitSpeciesBatch.field.speciesField.help= +tuttihelp.splitSpeciesBatch.help= Property changes on: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Mar 11 07:08:49 CET 2013 +#Tue Mar 12 09:29:29 CET 2013 tuttihelp.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tuttihelp.createSpeciesBatch.field.batchWeightField.help=createSpeciesBatch.html\#fields tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.help=createSpeciesBatch.html\#fields @@ -145,6 +145,10 @@ tuttihelp.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tuttihelp.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tuttihelp.fishingOperations.help=fishingOperations.html +tuttihelp.main.action.changeLocale.help= +tuttihelp.main.action.changeLocaleFR.help= +tuttihelp.main.action.changeLocaleUK.help= +tuttihelp.main.action.showHelp.help= tuttihelp.main.help=main.html tuttihelp.main.menu.action.about.help=main.html\#menu_ tuttihelp.main.menu.action.configuration.help=main.html\#menu_ Deleted: trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Créer un lot de poissons</title> -</head> -<body> - -<h1>Créer un lot de poissons</h1> - -<p>Sur cette écran on peut créer un lot de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/dbManager.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/dbManager.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/dbManager.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Gérer la base de données</title> -</head> -<body> - -<h1>Gérer la base de données</h1> - -<p>Sur cette écran on peut gérer la base de données...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture accidentelle</title> -</head> -<body> - -<h1>Éditer une capture accidentelle</h1> - -<p>Sur cette écran on peut éditer une capture accidentelle...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de Benthos</title> -</head> -<body> - -<h1>Éditer une capture de Benthos</h1> - -<p>Sur cette écran on peut éditer une capture de Benthos...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editCatchBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editCatchBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editCatchBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture</title> -</head> -<body> - -<h1>Éditer une capture</h1> - -<p>Sur cette écran on peut éditer une capture...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editCruise.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une campagne</title> -</head> -<body> - -<h1>Éditer une campagne</h1> - -<p>Sur cette écran on peut éditer une campagne...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editFishingOperation.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editFishingOperation.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer un trait</title> -</head> -<body> - -<h1>Éditer un trait</h1> - -<p>Sur cette écran on peut éditer un trait...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de macro-déchêts</title> -</head> -<body> - -<h1>Éditer une capture de macro-déchêts</h1> - -<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une capture de plancton</title> -</head> -<body> - -<h1>Éditer une capture de plancton</h1> - -<p>Sur cette écran on peut éditer une capture de plancton...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editProgram.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editProgram.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editProgram.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,54 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer une série de campagne</title> -</head> -<body> - -<h1>Éditer une série de campagne</h1> - -<p>Sur cette écran on peut éditer une campagne...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Zone</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editProtocol.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editProtocol.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editProtocol.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer un protocole</title> -</head> -<body> - -<h1>Éditer un protocole</h1> - -<p>Sur cette écran on peut éditer un protocole...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer les lots de poissons</title> -</head> -<body> - -<h1>Éditer les lots de poissons</h1> - -<p>Sur cette écran on peut éditer un lots de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer les mensurations d'un lot de poissons</title> -</head> -<body> - -<h1>Éditer les mensurations d'un lot de poissons</h1> - -<p>Sur cette écran on peut editer les mensurations d'un lot de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/createSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Créer un lot de poissons</title> +</head> +<body> + +<h1>Créer un lot de poissons</h1> + +<p>Sur cette écran on peut créer un lot de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/dbManager.html (from rev 579, trunk/tutti-ui-swing/src/main/help/dbManager.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/dbManager.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/dbManager.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Gérer la base de données</title> +</head> +<body> + +<h1>Gérer la base de données</h1> + +<p>Sur cette écran on peut gérer la base de données...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editAccidentalBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture accidentelle</title> +</head> +<body> + +<h1>Éditer une capture accidentelle</h1> + +<p>Sur cette écran on peut éditer une capture accidentelle...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editBenthosBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de Benthos</title> +</head> +<body> + +<h1>Éditer une capture de Benthos</h1> + +<p>Sur cette écran on peut éditer une capture de Benthos...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editCatchBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editCatchBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture</title> +</head> +<body> + +<h1>Éditer une capture</h1> + +<p>Sur cette écran on peut éditer une capture...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editCruise.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editCruise.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editCruise.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une campagne</title> +</head> +<body> + +<h1>Éditer une campagne</h1> + +<p>Sur cette écran on peut éditer une campagne...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editFishingOperation.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editFishingOperation.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer un trait</title> +</head> +<body> + +<h1>Éditer un trait</h1> + +<p>Sur cette écran on peut éditer un trait...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editMacroWasteBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de macro-déchêts</title> +</head> +<body> + +<h1>Éditer une capture de macro-déchêts</h1> + +<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editPlanktonBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de plancton</title> +</head> +<body> + +<h1>Éditer une capture de plancton</h1> + +<p>Sur cette écran on peut éditer une capture de plancton...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editProgram.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editProgram.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProgram.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editProgram.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,54 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une série de campagne</title> +</head> +<body> + +<h1>Éditer une série de campagne</h1> + +<p>Sur cette écran on peut éditer une campagne...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Zone</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editProtocol.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editProtocol.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editProtocol.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editProtocol.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer un protocole</title> +</head> +<body> + +<h1>Éditer un protocole</h1> + +<p>Sur cette écran on peut éditer un protocole...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer les lots de poissons</title> +</head> +<body> + +<h1>Éditer les lots de poissons</h1> + +<p>Sur cette écran on peut éditer un lots de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/editSpeciesFrequencies.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer les mensurations d'un lot de poissons</title> +</head> +<body> + +<h1>Éditer les mensurations d'un lot de poissons</h1> + +<p>Sur cette écran on peut editer les mensurations d'un lot de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html (from rev 579, trunk/tutti-ui-swing/src/main/help/fishingOperations.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/fishingOperations.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer / Créer des traits</title> +</head> +<body> + +<h1>Éditer / Créer des traits</h1> + +<p>Sur cette écran on peut créer / éditer des traits...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/main.html (from rev 579, trunk/tutti-ui-swing/src/main/help/main.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/main.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/main.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,48 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Écran principal</title> +</head> +<body> + +<h1>Écran principal</h1> + +<p>...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Menu</h2> +Actions possibles depuis le menu : + +<ul> + <li>Configuration</li> + <li>Gérerles bases</li> + <li>Quitter l'application</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html (from rev 579, trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/manageTemporaryReferential.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Gérer les référentiels temporaires</title> +</head> +<body> + +<h1>Gérer les référentiels temporaires</h1> + +<p>Sur cette écran on peut gérer les référentiels temporaires...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/selectCruise.html (from rev 579, trunk/tutti-ui-swing/src/main/help/selectCruise.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/selectCruise.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/selectCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Choisir la campagne</title> +</head> +<body> + +<h1>Choisir la campagne</h1> + +<p>Sur cette écran on peut choisir la campagne à utiliser...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/en/splitSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Catégoriser une capture de poissons</title> +</head> +<body> + +<h1>Catégoriser une capture de poissons</h1> + +<p>Sur cette écran on peut catégoriser une capture de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/fishingOperations.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fishingOperations.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/fishingOperations.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Éditer / Créer des traits</title> -</head> -<body> - -<h1>Éditer / Créer des traits</h1> - -<p>Sur cette écran on peut créer / éditer des traits...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/createSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/createSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Créer un lot de poissons</title> +</head> +<body> + +<h1>Créer un lot de poissons</h1> + +<p>Sur cette écran on peut créer un lot de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/dbManager.html (from rev 579, trunk/tutti-ui-swing/src/main/help/dbManager.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/dbManager.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/dbManager.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Gérer la base de données</title> +</head> +<body> + +<h1>Gérer la base de données</h1> + +<p>Sur cette écran on peut gérer la base de données...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editAccidentalBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editAccidentalBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture accidentelle</title> +</head> +<body> + +<h1>Éditer une capture accidentelle</h1> + +<p>Sur cette écran on peut éditer une capture accidentelle...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editBenthosBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editBenthosBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de Benthos</title> +</head> +<body> + +<h1>Éditer une capture de Benthos</h1> + +<p>Sur cette écran on peut éditer une capture de Benthos...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editCatchBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editCatchBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture</title> +</head> +<body> + +<h1>Éditer une capture</h1> + +<p>Sur cette écran on peut éditer une capture...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editCruise.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editCruise.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editCruise.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une campagne</title> +</head> +<body> + +<h1>Éditer une campagne</h1> + +<p>Sur cette écran on peut éditer une campagne...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editFishingOperation.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer un trait</title> +</head> +<body> + +<h1>Éditer un trait</h1> + +<p>Sur cette écran on peut éditer un trait...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editMacroWasteBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editMacroWasteBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de macro-déchêts</title> +</head> +<body> + +<h1>Éditer une capture de macro-déchêts</h1> + +<p>Sur cette écran on peut éditer une capture de macro-déchêts...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editPlanktonBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editPlanktonBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une capture de plancton</title> +</head> +<body> + +<h1>Éditer une capture de plancton</h1> + +<p>Sur cette écran on peut éditer une capture de plancton...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editProgram.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editProgram.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editProgram.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editProgram.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,54 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer une série de campagne</title> +</head> +<body> + +<h1>Éditer une série de campagne</h1> + +<p>Sur cette écran on peut éditer une campagne...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Zone</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editProtocol.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editProtocol.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer un protocole</title> +</head> +<body> + +<h1>Éditer un protocole</h1> + +<p>Sur cette écran on peut éditer un protocole...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer les lots de poissons</title> +</head> +<body> + +<h1>Éditer les lots de poissons</h1> + +<p>Sur cette écran on peut éditer un lots de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html (from rev 579, trunk/tutti-ui-swing/src/main/help/editSpeciesFrequencies.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/editSpeciesFrequencies.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer les mensurations d'un lot de poissons</title> +</head> +<body> + +<h1>Éditer les mensurations d'un lot de poissons</h1> + +<p>Sur cette écran on peut editer les mensurations d'un lot de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html (from rev 579, trunk/tutti-ui-swing/src/main/help/fishingOperations.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/fishingOperations.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Éditer / Créer des traits</title> +</head> +<body> + +<h1>Éditer / Créer des traits</h1> + +<p>Sur cette écran on peut créer / éditer des traits...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/main.html (from rev 579, trunk/tutti-ui-swing/src/main/help/main.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/main.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/main.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,48 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Écran principal</title> +</head> +<body> + +<h1>Écran principal</h1> + +<p>...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Menu</h2> +Actions possibles depuis le menu : + +<ul> + <li>Configuration</li> + <li>Gérerles bases</li> + <li>Quitter l'application</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html (from rev 579, trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/manageTemporaryReferential.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Gérer les référentiels temporaires</title> +</head> +<body> + +<h1>Gérer les référentiels temporaires</h1> + +<p>Sur cette écran on peut gérer les référentiels temporaires...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html (from rev 579, trunk/tutti-ui-swing/src/main/help/selectCruise.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/selectCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Choisir la campagne</title> +</head> +<body> + +<h1>Choisir la campagne</h1> + +<p>Sur cette écran on peut choisir la campagne à utiliser...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html (from rev 579, trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html) =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html (rev 0) +++ trunk/tutti-ui-swing/src/main/help/fr/splitSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2012 - 2013 Ifremer + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<!DOCTYPE html> +<html lang="fr"> + +<head> + <meta charset="utf-8"/> + <title>Tutti - Catégoriser une capture de poissons</title> +</head> +<body> + +<h1>Catégoriser une capture de poissons</h1> + +<p>Sur cette écran on peut catégoriser une capture de poissons...</p> + +<strong>Documentation à rédiger</strong> + +<h2>Champs</h2> +<ul> + <li>Nom</li> + <li>Commentaire</li> +</ul> + +<h2>Actions</h2> +Actions possibles : + +<ul> + <li>Annuler</li> + <li>Enregister</li> +</ul> +</body> +</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/main.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/main.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/main.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,48 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Écran principal</title> -</head> -<body> - -<h1>Écran principal</h1> - -<p>...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Menu</h2> -Actions possibles depuis le menu : - -<ul> - <li>Configuration</li> - <li>Gérerles bases</li> - <li>Quitter l'application</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/manageTemporaryReferential.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Gérer les référentiels temporaires</title> -</head> -<body> - -<h1>Gérer les référentiels temporaires</h1> - -<p>Sur cette écran on peut gérer les référentiels temporaires...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/selectCruise.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/selectCruise.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/selectCruise.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Choisir la campagne</title> -</head> -<body> - -<h1>Choisir la campagne</h1> - -<p>Sur cette écran on peut choisir la campagne à utiliser...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Deleted: trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/help/splitSpeciesBatch.html 2013-03-12 09:10:25 UTC (rev 581) @@ -1,53 +0,0 @@ -<!-- - #%L - Tutti :: UI - $Id$ - $HeadURL$ - %% - Copyright (C) 2012 - 2013 Ifremer - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-3.0.html>. - #L% - --> -<!DOCTYPE html> -<html lang="fr"> - -<head> - <meta charset="utf-8"/> - <title>Tutti - Catégoriser une capture de poissons</title> -</head> -<body> - -<h1>Catégoriser une capture de poissons</h1> - -<p>Sur cette écran on peut catégoriser une capture de poissons...</p> - -<strong>Documentation à rédiger</strong> - -<h2>Champs</h2> -<ul> - <li>Nom</li> - <li>Commentaire</li> -</ul> - -<h2>Actions</h2> -Actions possibles : - -<ul> - <li>Annuler</li> - <li>Enregister</li> -</ul> -</body> -</html> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-03-12 09:10:25 UTC (rev 581) @@ -101,12 +101,14 @@ UIManager.put("Table.focusCellHighlightBorder", new BorderUIResource.LineBorderUIResource(Color.BLACK)); - startTutti(context); + startTutti(context, true); } - public static void startTutti(TuttiUIContext context) { + public static void startTutti(TuttiUIContext context, boolean openContext) { - context.open(); + if (openContext) { + context.open(); + } MainUI mainUI = new MainUI(context); context.addMessageNotifier(mainUI.getHandler()); @@ -115,12 +117,14 @@ public static void closeTutti(MainUI ui, boolean exit) { - ui.getHandler().getContext().getSwingSession().save(); + TuttiUIContext context = ui.getHandler().getContext(); + // close ui ui.getHandler().onCloseUI(); - ui.setVisible(false); - ui.dispose(); + //close context + context.getSwingSession().save(); + context.close(); if (exit) { System.exit(0); 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-03-12 09:10:25 UTC (rev 581) @@ -41,6 +41,7 @@ import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.TuttiErrorHelper; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import jaxx.runtime.JAXXContext; @@ -56,7 +57,6 @@ import org.nuiton.i18n.init.UserI18nInitializer; import org.nuiton.widget.SwingSession; -import java.awt.Desktop; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Closeable; @@ -99,12 +99,15 @@ public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; - public static final String PROPERTY_BUSY= "busy"; + public static final String PROPERTY_BUSY = "busy"; - public static final Set<String> ID_TO_SAVE_PROPERTIES = Sets.newHashSet( + public static final String PROPERTY_LOCALE = "locale"; + + public static final Set<String> PROPERTIES_TO_SAVE = Sets.newHashSet( PROPERTY_PROGRAM_ID, PROPERTY_CRUISE_ID, - PROPERTY_PROTOCOL_ID); + PROPERTY_PROTOCOL_ID, + PROPERTY_LOCALE); public static final String PROPERTY_DB_EXIST = "dbExist"; @@ -195,7 +198,15 @@ protected TuttiScreen screen; /** + * Current locale used in application. + * + * @since 1.0.3 + */ + protected Locale locale; + + /** * Busy state ({@code true} when a blocking action is running). + * * @since 1.0.3 */ protected boolean busy; @@ -376,6 +387,15 @@ firePropertyChange(PROPERTY_BUSY, null, busy); } + public Locale getLocale() { + return locale; + } + + public void setLocale(Locale locale) { + this.locale = locale; + firePropertyChange(PROPERTY_LOCALE, null, locale); + } + public boolean isDbLoaded() { return dbLoaded; } @@ -544,26 +564,28 @@ public void open() { + setLocale(config.getI18nLocale()); + if (programId == null) { // load it from config - setProgramId(getConfig().getProgramId()); + setProgramId(config.getProgramId()); } if (cruiseId == null) { // load it from config - setCruiseId(getConfig().getCruiseId()); + setCruiseId(config.getCruiseId()); } if (protocolId == null) { // load it from config - setProtocolId(getConfig().getProtocolId()); + setProtocolId(config.getProtocolId()); } boolean dbExists = - getConfig().getServiceConfig().getPersistenceConfig().isDbExists(); + config.getServiceConfig().getPersistenceConfig().isDbExists(); setDbExist(dbExists); @@ -584,7 +606,7 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if (ID_TO_SAVE_PROPERTIES.contains(evt.getPropertyName())) { + if (PROPERTIES_TO_SAVE.contains(evt.getPropertyName())) { saveContextToConfig(); } } @@ -626,11 +648,13 @@ protected void saveContextToConfig() { if (log.isInfoEnabled()) { log.info("Save config (programId: " + programId + ", cruiseId: " + - cruiseId + ", protocolId: " + protocolId + ')'); + cruiseId + ", protocolId: " + protocolId + ", locale: " + + locale + ")"); } config.setProgramId(programId); config.setCruiseId(cruiseId); config.setProtocolId(protocolId); + config.setI18nLocale(locale); config.save(); } @@ -638,6 +662,10 @@ this.messageNotifiers.add(messageNotifier); } + public void removeMessageNotifier(UIMessageNotifier messageNotifier) { + this.messageNotifiers.remove(messageNotifier); + } + @Override public void showInformationMessage(String message) { for (UIMessageNotifier messageNotifier : messageNotifiers) { @@ -770,20 +798,16 @@ String value = (String) helpMapping.get(helpId); if (value == null) { - throw new TuttiTechnicalException("Could not find help page for " + helpId); + throw new TuttiTechnicalException( + "Could not find help page for " + helpId); } - URI resolvedUri = getConfig().getHelpDirectory().toURI().resolve(value); - try { + File helpDirectory = getConfig().getHelpDirectoryWithLocale(); + URI resolvedUri = helpDirectory.toURI().resolve(value); + TuttiUIUtil.openLink(resolvedUri); + } - if (log.isDebugEnabled()) { - log.debug("Opening uri " + resolvedUri); - } - - Desktop.getDesktop().browse(resolvedUri); - } catch (Exception eee) { - throw new TuttiTechnicalException("Could not open help page at " + helpId); - } - + public void reloadDecoratorService() { + serviceContext.reloadService(DecoratorService.class); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-12 09:10:25 UTC (rev 581) @@ -33,11 +33,11 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.Version; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.util.config.ApplicationConfigHelper; import org.nuiton.util.config.ApplicationConfigProvider; import org.nuiton.util.config.ArgumentsParserException; -import org.nuiton.util.Version; import javax.swing.KeyStroke; import java.awt.Color; @@ -166,7 +166,8 @@ try { applicationConfig.save(file, false, optionKeyToNotSave); } catch (IOException e) { - throw new RuntimeException("Could notsave configuration at " + file, e); + throw new TuttiTechnicalException( + "Could not save configuration at " + file, e); } } @@ -296,11 +297,20 @@ TuttiApplicationConfigOption.TUTTI_I18N_LOCALE.getKey()); } + public void setI18nLocale(Locale locale) { + applicationConfig.setOption(TuttiApplicationConfigOption.TUTTI_I18N_LOCALE.getKey(), locale.toString()); + } + public File getHelpDirectory() { return applicationConfig.getOptionAsFile( TuttiApplicationConfigOption.TUTTI_HELP_DIRECTORY.getKey()); } + public File getHelpDirectoryWithLocale() { + File result = getHelpDirectory(); + return new File(result, getI18nLocale().getLanguage()); + } + public void setProgramId(String programId) { if (programId == null) { programId = ""; @@ -329,5 +339,4 @@ public String getUpdateUrl() { return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL.getKey()); } - } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 09:10:25 UTC (rev 581) @@ -140,14 +140,14 @@ } protected void reloadApplication() { - mainUI.getHandler().reloadApplication(); + mainUI.getHandler().reloadTutti(); } protected void reloadUI() { - mainUI.getHandler().reloadTutti(); + mainUI.getHandler().reloadUI(); } protected void reloadShortcuts() { - mainUI.getHandler().reloadShortcuts(); + mainUI.getHandler().reloadUI(); } } Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.Locale; + +/** + * @author tchemit <chemit@codelutin.com> + * @since 1.0.3 + */ +public class ChangeToLocaleFRAction extends AbstractMainUITuttiAction { + + public ChangeToLocaleFRAction(MainUIHandler handler) { + super(handler, true); + } + + @Override + protected void doAction() throws Exception { + + getHandler().changeLocale(Locale.FRANCE); + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleFRAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,45 @@ +package fr.ifremer.tutti.ui.swing.content; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import java.util.Locale; + +/** + * @author tchemit <chemit@codelutin.com> + * @since 1.0.3 + */ +public class ChangeToLocaleUKAction extends AbstractMainUITuttiAction { + + public ChangeToLocaleUKAction(MainUIHandler handler) { + super(handler, true); + } + + @Override + protected void doAction() throws Exception { + + getHandler().changeLocale(Locale.UK); + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ChangeToLocaleUKAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-12 09:10:25 UTC (rev 581) @@ -76,6 +76,34 @@ _help: {"tuttihelp.main.menu.action.manageDb.help"}; } +#menuChangeLocale { + actionIcon: translate; + text: "tutti.menu.changeLocale"; + toolTipText: "tuttihelp.main.action.changeLocale.tip"; + mnemonic: A; + _help: {"tuttihelp.main.action.changeLocale.help"}; +} + +#menuChangeLocaleFR { + actionIcon: i18n-fr; + text: "tutti.action.changeLocaleFR"; + toolTipText: "tuttihelp.main.action.changeLocaleFR.tip"; + mnemonic: F; + enabled: {!handler.acceptLocale(model.getLocale(), "fr_FR")}; + _tuttiAction: {ChangeToLocaleFRAction.class}; + _help: {"tuttihelp.main.action.changeLocaleFR.help"}; +} + +#menuChangeLocaleUK { + actionIcon: i18n-uk; + text: "tutti.action.changeLocaleUK"; + toolTipText: "tuttihelp.main.action.changeLocaleUK.tip"; + mnemonic: n; + enabled: {!handler.acceptLocale(model.getLocale(), "en_GB")}; + _tuttiAction: {ChangeToLocaleUKAction.class}; + _help: {"tuttihelp.main.action.changeLocaleUK.help"}; +} + #menuActions { text: "tutti.menu.actions"; toolTipText: "tuttihelp.main.action.actions.tip"; @@ -168,10 +196,18 @@ #menuHelp { text: "tutti.menu.help"; - toolTipText: "tuttihelp.menu.action.help.tip"; + toolTipText: "tuttihelp.main.action.help.tip"; mnemonic: E; } +#menuShowHelp { + actionIcon: help; + text: "tutti.action.showHelp"; + toolTipText: "tuttihelp.main.action.showHelp.tip"; + mnemonic: e; + _help: {"tuttihelp.main.action.showHelp.help"}; +} + #menuHelpSite { actionIcon: site; text: "tutti.action.site"; 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx 2013-03-12 09:10:25 UTC (rev 581) @@ -58,7 +58,7 @@ } protected void $afterCompleteSetup() { - getHandler().afterInitUI(); + handler.afterInitUI(); } ]]></script> @@ -66,7 +66,7 @@ <JMenuBar id='menu'> <JMenu id='menuFile'> <JMenuItem id='menuFileConfiguration' - onActionPerformed="getHandler().showConfig()"/> + onActionPerformed="handler.showConfig()"/> <JMenuItem id='menuActionUpdate'/> <JSeparator/> <JMenuItem id='menuActionManageDb'/> @@ -88,10 +88,16 @@ </JMenu> <JMenu id='menuHelp'> + <JMenuItem id='menuShowHelp' + onActionPerformed="handler.showHelp()"/> <JMenuItem id='menuHelpSite' - onActionPerformed='getHandler().gotoSite()'/> + onActionPerformed='handler.gotoSite()'/> <JMenuItem id='menuHelpAbout' - onActionPerformed='getHandler().showAbout()'/> + onActionPerformed='handler.showAbout()'/> + <JMenu id='menuChangeLocale'> + <JMenuItem id='menuChangeLocaleUK'/> + <JMenuItem id='menuChangeLocaleFR'/> + </JMenu> </JMenu> </JMenuBar> 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -47,7 +47,9 @@ import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.CloseableUI; +import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import jaxx.runtime.SwingUtil; @@ -55,20 +57,22 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import org.nuiton.util.config.ApplicationConfig; import org.nuiton.widget.SwingSession; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JComponent; +import javax.swing.JEditorPane; import javax.swing.JLabel; +import javax.swing.JScrollPane; import javax.swing.JToolBar; import java.awt.Cursor; -import java.awt.Desktop; import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.net.URL; import java.util.Calendar; +import java.util.Locale; import static org.nuiton.i18n.I18n._; @@ -103,11 +107,11 @@ @Override public void beforeInitUI() { - context.addPropertyChangeListener(new PropertyChangeListener() { + context.addPropertyChangeListener(new RemoveablePropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { String propertyName = evt.getPropertyName(); - if (TuttiUIContext.ID_TO_SAVE_PROPERTIES.contains(propertyName)) { + if (TuttiUIContext.PROPERTIES_TO_SAVE.contains(propertyName)) { // change the ui title changeTitle(); @@ -120,7 +124,7 @@ ui.setContextValue(ui, MainUI.class.getName()); // ecoute des changements de l'état busy - context.addPropertyChangeListener(TuttiUIContext.PROPERTY_BUSY, new PropertyChangeListener() { + context.addPropertyChangeListener(TuttiUIContext.PROPERTY_BUSY, new RemoveablePropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { @@ -154,6 +158,10 @@ // installation layer de blocage en mode busy SwingUtil.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); + //FIXME-TC See why this binding is not setted ? + ui.applyDataBinding(MainUI.BINDING_MENU_CHANGE_LOCALE_FR_ENABLED); + ui.applyDataBinding(MainUI.BINDING_MENU_CHANGE_LOCALE_UK_ENABLED); + // Init SwingSession SwingSession swingSession = context.getSwingSession(); swingSession.add(ui); @@ -166,28 +174,49 @@ JToolBar bar = ui.getBottomBar(); ui.getStatus().addWidget(bar, 0); - if (context.isDbExist()) { + if (context.isDbLoaded()) { - // open tutti db (using a fake button to have simple api) - TuttiUIAction<OpenDbAction> uiAction = createUIAction(null, OpenDbAction.class); - OpenDbAction logicAction = uiAction.getLogicAction(); + // db already opened (happens when reloading ui) + // just go to select cruise screen + TuttiUIAction<SelectCruiseAction> uiAction = createUIAction(null, SelectCruiseAction.class); + SelectCruiseAction logicAction = uiAction.getLogicAction(); logicAction.setSkipCheckCurrentScreen(true); - logicAction.setActionDescription(_("tuttihelp.dbManager.action.openDb.tip")); + logicAction.setActionDescription(ui.getMenuActionSelectCruise().getToolTipText()); uiAction.actionPerformed(null); + } else { - // clean db context - context.clearDbContext(); + if (context.isDbExist()) { - // go to manage db screen (to install db) - context.setScreen(TuttiScreen.MANAGE_DB); + // open tutti db (using a fake button to have simple api) + TuttiUIAction<OpenDbAction> uiAction = createUIAction(null, OpenDbAction.class); + OpenDbAction logicAction = uiAction.getLogicAction(); + logicAction.setSkipCheckCurrentScreen(true); + logicAction.setActionDescription(_("tuttihelp.dbManager.action.openDb.tip")); + uiAction.actionPerformed(null); + } else { + + // clean db context + context.clearDbContext(); + + // go to manage db screen (to install db) + context.setScreen(TuttiScreen.MANAGE_DB); + } + } } @Override public void onCloseUI() { - context.close(); + // remove any screen + context.setScreen(null); + context.removeMessageNotifier(this); + + TuttiUIUtil.closeBean(context); + TuttiUIUtil.closeUI(ui); + ui.setVisible(false); + ui.dispose(); } @Override @@ -204,17 +233,37 @@ // Close the application RunTutti.closeTutti(ui, false); - RunTutti.startTutti(context); + RunTutti.startTutti(context, true); } - public void reloadApplication() { - //TODO + public void reloadUI() { + + //close ui + getUI().getHandler().onCloseUI(); + + // restart ui + RunTutti.startTutti(getContext(), false); } - public void reloadShortcuts() { - //TODO + public boolean acceptLocale(Locale l, String expected) { + return l != null && l.toString().equals(expected); } + public void changeLocale(Locale locale) { + + // change locale (and save configuration) + getModel().setLocale(locale); + + // change i18n locale + I18n.setDefaultLocale(getConfig().getI18nLocale()); + + // reload decorator service (TODO Check if this is necessary) + getContext().reloadDecoratorService(); + + // close reload + reloadUI(); + } + public void showConfig() { TuttiConfigUI configUI = new TuttiConfigUI(ui); @@ -253,6 +302,19 @@ about.setLicenseFile(licensePath); about.setThirdpartyFile(thirdPartyPath); about.buildTopPanel(); + + JScrollPane component = new JScrollPane(); + JEditorPane translateArea = new JEditorPane(); + translateArea.setContentType("text/html"); + translateArea.setEditable(false); + if (translateArea.getFont() != null) { + translateArea.setFont(translateArea.getFont().deriveFont((float) 11)); + } + translateArea.setBorder(null); + String text = _("tutti.about.translate.content"); + translateArea.setText(text); + component.getViewport().add(translateArea); + about.getTabs().add(_("tutti.title.about.translate"), component); about.init(); about.showInDialog(ui, true); @@ -268,17 +330,13 @@ if (log.isDebugEnabled()) { log.debug("goto " + siteURL); } - if (Desktop.isDesktopSupported() && - Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { - try { - Desktop.getDesktop().browse(siteURL.toURI()); - } catch (Exception e) { - TuttiUIContext.getErrorHelper().showErrorDialog( - "Failed to open '" + siteURL + "' in browser", e); - } - } + TuttiUIUtil.openLink(siteURL); } + public void showHelp() { + getModel().showHelp(ui, ui.getBroker(), null); + } + @Override public final void showInformationMessage(String message) { ui.getStatus().setStatus("<html><body>" + message + "</body></html>"); @@ -295,18 +353,29 @@ public boolean quitCurrentScreen() { - TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; - Preconditions.checkNotNull(currentBody); - AbstractTuttiUIHandler<?, ?> handler = body.getHandler(); boolean canClose; - if (handler instanceof CloseableUI) { + if (context.getScreen() == null) { - // try to quit UI - canClose = ((CloseableUI) handler).quitUI(); + // no screen, surely can quit + canClose = true; + if (log.isWarnEnabled()) { + log.warn("=================================================="); + log.warn("No screen, Should then skipCheckCurrent in action."); + log.warn("=================================================="); + } } else { + TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; + Preconditions.checkNotNull(currentBody); + AbstractTuttiUIHandler<?, ?> handler = body.getHandler(); + if (handler instanceof CloseableUI) { - // can always close ui - canClose = true; + // try to quit UI + canClose = ((CloseableUI) handler).quitUI(); + } else { + + // can always close ui + canClose = true; + } } return canClose; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2013-03-12 09:10:25 UTC (rev 581) @@ -108,7 +108,7 @@ </cell> <cell weightx='1'> <BeanFilterableComboBox id='programComboBox' constructorParams='this' - genericType='Program'/> + genericType='Program'/> </cell> <cell anchor='west'> <JLabel id='yearLabel'/> @@ -153,7 +153,7 @@ </cell> <cell weightx='0.3'> <BeanFilterableComboBox id='countryComboBox' constructorParams='this' - genericType='Country'/> + genericType='Country'/> </cell> <cell> <JLabel id='beginDateLabel'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -192,12 +192,12 @@ }); initBeanFilterableComboBox(ui.getProgramComboBox(), - persistenceService.getAllProgram(), - model.getProgram()); + persistenceService.getAllProgram(), + model.getProgram()); initBeanFilterableComboBox(ui.getCountryComboBox(), - persistenceService.getAllCountry(), - model.getCountry()); + persistenceService.getAllCountry(), + model.getCountry()); initBeanList(ui.getVesselList(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.ui.swing.TuttiScreen; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-03-12 09:10:25 UTC (rev 581) @@ -87,7 +87,7 @@ </cell> <cell weightx='1.0'> <BeanFilterableComboBox id='programCombobox' constructorParams='this' - genericType='Program'/> + genericType='Program'/> </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> @@ -102,7 +102,7 @@ </cell> <cell> <BeanFilterableComboBox id='cruiseCombobox' constructorParams='this' - genericType='Cruise'/> + genericType='Cruise'/> </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> @@ -117,7 +117,7 @@ </cell> <cell> <BeanFilterableComboBox id='protocolCombobox' constructorParams='this' - genericType='TuttiProtocol'/> + genericType='TuttiProtocol'/> </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import jaxx.runtime.swing.editor.bean.BeanComboBox; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; @@ -45,7 +45,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; /** * Main ui content to select cruise. @@ -140,16 +139,16 @@ SelectCruiseUIModel model = getModel(); initBeanFilterableComboBox(ui.getProgramCombobox(), - model.getPrograms(), - model.getProgram()); + model.getPrograms(), + model.getProgram()); initBeanFilterableComboBox(ui.getCruiseCombobox(), - model.getCruises(), - model.getCruise()); + model.getCruises(), + model.getCruise()); initBeanFilterableComboBox(ui.getProtocolCombobox(), - model.getProtocols(), - model.getProtocol()); + model.getProtocols(), + model.getProtocol()); ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,11 +24,6 @@ * #L% */ -import com.ezware.oxbow.swingbits.table.filter.DistinctColumnItem; -import com.ezware.oxbow.swingbits.table.filter.IFilterChangeListener; -import com.ezware.oxbow.swingbits.table.filter.ITableFilter; -import com.ezware.oxbow.swingbits.table.filter.JTableFilter; -import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; @@ -44,7 +39,6 @@ import javax.swing.table.TableModel; import java.awt.Component; import java.awt.event.FocusEvent; -import java.util.Collection; /** * Abstract ui handler forbatch ui. @@ -116,28 +110,28 @@ installTableKeyListener(columnModel, table); - JTableFilter tableFilter = new JTableFilter(table); - TableRowFilterSupport.forFilter(tableFilter).searchable(true).useTableRenderers(true).actions(true).apply(); +// JTableFilter tableFilter = new JTableFilter(table); +// TableRowFilterSupport.forFilter(tableFilter).searchable(true).useTableRenderers(true).actions(true).apply(); +// +// tableFilter.addChangeListener(new IFilterChangeListener() { +// @Override +// public void filterChanged(ITableFilter<?> filter) { +// if (log.isInfoEnabled()) { +// log.info("Filter changed " + filter); +// } +// TableModel model = filter.getTable().getModel(); +// int columnCount = model.getColumnCount(); +// for (int i = 0; i < columnCount; i++) { +// if (filter.isFiltered(i)) { +// Collection<DistinctColumnItem> filterState = filter.getFilterState(i); +// if (log.isInfoEnabled()) { +// log.info("Column " + i + " is filtered: " + filterState); +// } +// } +// } +// } +// }); - tableFilter.addChangeListener(new IFilterChangeListener() { - @Override - public void filterChanged(ITableFilter<?> filter) { - if (log.isInfoEnabled()) { - log.info("Filter changed " + filter); - } - TableModel model = filter.getTable().getModel(); - int columnCount = model.getColumnCount(); - for (int i = 0; i < columnCount; i++) { - if (filter.isFiltered(i)) { - Collection<DistinctColumnItem> filterState = filter.getFilterState(i); - if (log.isInfoEnabled()) { - log.info("Column " + i + " is filtered: " + filterState); - } - } - } - } - }); - TableSortController<TableModel> sorter = new TableSortController<TableModel>(tableModel); sorter.setSortable(false); table.setRowSorter(sorter); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -103,7 +103,7 @@ protected ComputeWeightsAction computeWeightsAction; /** - * Delgate action to save catch batch. + * Delegate action to save catch batch. * * @since 1.0 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -248,12 +248,12 @@ model.getRecorderPerson()); initBeanFilterableComboBox(ui.getVesselComboBox(), - Lists.<Vessel>newArrayList(), - null); + Lists.<Vessel>newArrayList(), + null); initBeanFilterableComboBox(ui.getGearComboBox(), - Lists.<Gear>newArrayList(), - null); + Lists.<Gear>newArrayList(), + null); Cruise cruise = getDataContext().getCruise(); Preconditions.checkNotNull(cruise, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -121,8 +121,8 @@ List<FishingOperation> fishingOperations = model.getFishingOperation(); initBeanFilterableComboBox(ui.getFishingOperationComboBox(), - fishingOperations, - model.getSelectedFishingOperation()); + fishingOperations, + model.getSelectedFishingOperation()); model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -297,4 +296,4 @@ persistenceService.saveAccidentalBatch(catchBean); } } -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -332,4 +331,4 @@ } } -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -305,4 +304,4 @@ persistenceService.savePlanktonBatch(catchBean); } } -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -59,8 +59,8 @@ initUI(ui); initBeanFilterableComboBox(ui.getSpeciesCombo(), - Lists.<Species>newArrayList(), - null); + Lists.<Species>newArrayList(), + null); getModel().addPropertyChangeListener( SelectSpeciesUIModel.PROPERTY_SPECIES, Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -41,7 +41,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -87,7 +86,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; -import java.util.Arrays; import java.util.EnumMap; import java.util.List; import java.util.Map; @@ -242,8 +240,8 @@ if (log.isDebugEnabled()) { log.debug("Loaded root batch " + - decorate(rootRow.getSpecies()) + " - " + - decorate(rootRow.getSortedUnsortedCategoryValue())); + decorate(rootRow.getSpecies()) + " - " + + decorate(rootRow.getSortedUnsortedCategoryValue())); } } } @@ -1178,8 +1176,8 @@ Preconditions.checkNotNull(row.getSortedUnsortedCategoryValue()); if (log.isDebugEnabled()) { log.debug("Add to speciesUsed: " + - decorate(row.getSortedUnsortedCategoryValue()) + - " - " + decorate(row.getSpecies())); + decorate(row.getSortedUnsortedCategoryValue()) + + " - " + decorate(row.getSpecies())); } SpeciesBatchUIModel model = getModel(); model.getSpeciesUsed().put(row.getSortedUnsortedCategoryValue(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -202,8 +202,8 @@ } initBeanFilterableComboBox(ui.getLengthStepCaracteristicComboBox(), - lengthStepCaracterics, - model.getLengthStepCaracteristic()); + lengthStepCaracterics, + model.getLengthStepCaracteristic()); //TODO Should it come from PROTOCOL or config ? model.setStep(.5f); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-03-12 09:10:25 UTC (rev 581) @@ -88,7 +88,7 @@ </cell> <cell weightx='1.0'> <BeanFilterableComboBox id='speciesComboBox' constructorParams='this' - genericType='Species'/> + genericType='Species'/> </cell> <cell> <JButton id='addSpeciesButton'/> @@ -102,8 +102,8 @@ </cell> <cell weightx='1.0' columns='2'> <BeanFilterableComboBox id='sortedUnsortedCategoryComboBox' - constructorParams='this' - genericType='CaracteristicQualitativeValue'/> + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SelectSpeciesUI; @@ -102,15 +101,15 @@ boolean protocolFilled = context.isProtocolFilled(); initBeanFilterableComboBox(ui.getSpeciesComboBox(), - Lists.<Species>newArrayList(), - null); + Lists.<Species>newArrayList(), + null); Caracteristic caracteristic = persistenceService.getSortedUnsortedCaracteristic(); initBeanFilterableComboBox(ui.getSortedUnsortedCategoryComboBox(), - caracteristic.getQualitativeValue(), - null); + caracteristic.getQualitativeValue(), + null); getModel().addPropertyChangeListener(CreateSpeciesBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -114,8 +114,8 @@ EditProgramUIModel model = getModel(); initBeanFilterableComboBox(ui.getZoneComboBox(), - persistenceService.getAllProgramZone(), - model.getZone()); + persistenceService.getAllProgramZone(), + model.getZone()); SwingValidator validator = ui.getValidator(); listenValidatorValid(validator, model); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import java.util.Collection; @@ -82,4 +81,4 @@ } -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-03-12 09:10:25 UTC (rev 581) @@ -146,8 +146,9 @@ <row fill='both'> <cell fill='both' weightx='1'> - <BeanFilterableComboBox id='speciesComboBox' constructorParams='this' - genericType='Species'/> + <BeanFilterableComboBox id='speciesComboBox' + constructorParams='this' + genericType='Species'/> </cell> <cell fill='both'> <JButton id='selectOtherSpeciesButton'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolCaracteristicAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ImportProtocolSpeciesAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -10,15 +10,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; @@ -85,4 +84,4 @@ speciesStr)); } -} \ No newline at end of file +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -52,7 +52,7 @@ private File file; public ExportTemporaryGearExampleAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true ); + super(handler, true); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; @@ -53,7 +53,7 @@ private File file; public ExportTemporaryPersonExampleAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true ); + super(handler, true); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryGearAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryPersonAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -51,7 +51,7 @@ private File file; public ImportTemporaryPersonAction(ManageTemporaryReferentialUIHandler handler) { - super(handler, true ); + super(handler, true); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporarySpeciesAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ImportTemporaryVesselAction.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-03-12 09:10:25 UTC (rev 581) @@ -44,11 +44,10 @@ import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.NumberEditor; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.editor.bean.BeanDoubleList; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,7 +93,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import static org.nuiton.i18n.I18n._; @@ -435,11 +433,11 @@ } } - public <A extends AbstractTuttiAction> A getLogicAction(AbstractButton b){ + public <A extends AbstractTuttiAction> A getLogicAction(AbstractButton b) { Action action = b.getAction(); Preconditions.checkNotNull(action); Preconditions.checkState(action instanceof TuttiUIAction); - return ((TuttiUIAction<A>)action).getLogicAction(); + return ((TuttiUIAction<A>) action).getLogicAction(); } protected void doAction(AbstractButton button, ActionEvent event) { Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,40 @@ +package fr.ifremer.tutti.ui.swing.util; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.ui.swing.TuttiUIContext; + +import java.beans.PropertyChangeListener; + +/** + * Use this contract when you want the listener to be removed when closing an ui. + * <p/> + * Form the moment only {@link TuttiUIContext} used it when reloading main ui. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0.3 + */ +public abstract class RemoveablePropertyChangeListener implements PropertyChangeListener { +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/RemoveablePropertyChangeListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-03-12 09:10:25 UTC (rev 581) @@ -26,11 +26,15 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.TuttiTechnicalException; +import jaxx.runtime.JAXXBinding; +import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.beans.AbstractBean; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.nuiton.util.FileUtil; @@ -39,7 +43,13 @@ import javax.swing.UIManager; import java.awt.Color; import java.awt.Component; +import java.awt.Desktop; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeListenerProxy; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -201,4 +211,61 @@ return textValue; } + public static void openLink(URL url) { + try { + openLink(url.toURI()); + } catch (URISyntaxException e) { + throw new TuttiTechnicalException("Could not open link: " + url, e); + } + } + + public static void openLink(URI uri) { + + try { + if (!Desktop.isDesktopSupported()) { + throw new TuttiTechnicalException( + _("swing.error.desktop.not.supported")); + } + + + Desktop desktop = Desktop.getDesktop(); + + if (!desktop.isSupported(Desktop.Action.BROWSE)) { + + throw new TuttiTechnicalException( + _("swing.error.desktop.browse.not.supported")); + } + + desktop.browse(uri); + } catch (Exception e) { + + throw new TuttiTechnicalException("Could not open link: " + uri, e); + } + } + + public static void closeBean(AbstractBean bean) { + PropertyChangeListener[] propertyChangeListeners = + bean.getPropertyChangeListeners(); + for (PropertyChangeListener listener : propertyChangeListeners) { + if (listener instanceof PropertyChangeListenerProxy) { + PropertyChangeListenerProxy proxy = (PropertyChangeListenerProxy) listener; + listener = proxy.getListener(); + } + if (listener instanceof RemoveablePropertyChangeListener) { + if (log.isDebugEnabled()) { + log.debug("Remove listener: " + listener); + } + bean.removePropertyChangeListener(listener); + } + + } + } + + public static void closeUI(JAXXObject ui) { + JAXXBinding[] bindings = ui.getDataBindings(); + for (JAXXBinding binding : bindings) { + SwingUtil.removeDataBinding(ui, binding.getId()); + } + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIModel.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIModel.java 2013-03-12 09:10:25 UTC (rev 581) @@ -24,7 +24,7 @@ * #L% */ -import com.ezware.oxbow.swingbits.util.Preconditions; +import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.ProgressionModel; import org.jdesktop.beans.AbstractSerializableBean; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2013-03-12 09:10:25 UTC (rev 581) @@ -28,7 +28,6 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +37,6 @@ import javax.swing.border.LineBorder; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.table.TableCellEditor; import java.awt.Color; import java.awt.Component; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/ColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/ColumnIdentifier.java 2013-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/ColumnIdentifier.java 2013-03-12 09:10:25 UTC (rev 581) @@ -51,8 +51,8 @@ } public static <R> ColumnIdentifier<R> newReadOnlyId(String propertyName, - String headerI18nKey, - String headerTipI18nKey) { + String headerI18nKey, + String headerTipI18nKey) { return new ColumnIdentifier<R>(propertyName, headerI18nKey, headerTipI18nKey) { Added: 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 (rev 0) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -0,0 +1,679 @@ +swing.error.desktop.browse.not.supported= +swing.error.desktop.not.supported= +tutti.about.bottomText= +tutti.about.message= +tutti.about.translate.content=<h3>How to translate Tutti</h3>You can help us to translate or improve label in Tutti.<br/><ul><li>Get the <strong>tutti-i18n.csv</strong> file in the <strong>i18n</strong> directory</li><li>open it in Libre office (separator caracter is <strong>Tab</strong>)</li><li>Do you work \:)</li><li>At last, send us back the modified file</li></ul><br/>We will apply the patch before next release. +tutti.action.about= +tutti.action.addSpecies= +tutti.action.attachments= +tutti.action.attachments.tip= +tutti.action.cancel= +tutti.action.cancelEditCatchBatch= +tutti.action.cancelEditCruise= +tutti.action.cancelEditFishingOperation= +tutti.action.cancelEditProgram= +tutti.action.cancelEditProtocol= +tutti.action.changeLocaleFR= +tutti.action.changeLocaleUK= +tutti.action.chooseDbExportFile= +tutti.action.chooseProtocolCaracteristicFile= +tutti.action.chooseProtocolFile= +tutti.action.chooseProtocolSpeciesFile= +tutti.action.chooseReferentialGearFile= +tutti.action.chooseReferentialPersonFile= +tutti.action.chooseReferentialSpeciesFile= +tutti.action.chooseReferentialVesselFile= +tutti.action.cloneProtocol= +tutti.action.close= +tutti.action.closeAttachment.tip= +tutti.action.closeDb= +tutti.action.computeWeights= +tutti.action.computeWeights.error.incoherentCategoryWeight= +tutti.action.computeWeights.error.incoherentParentCategoryWeight= +tutti.action.computeWeights.error.incoherentRowWeightCategory= +tutti.action.computeWeights.error.incoherentRowWeightFrequency= +tutti.action.computeWeights.error.incoherentSpeciesTotalSorted= +tutti.action.computeWeights.error.incoherentTotal= +tutti.action.computeWeights.error.noWeight= +tutti.action.computeWeights.replaceTotalSortedWeight.message= +tutti.action.computeWeights.replaceTotalSortedWeight.title= +tutti.action.configuration= +tutti.action.createMelag= +tutti.action.createSpeciesBatch= +tutti.action.deleteProtocol= +tutti.action.deleteProtocol.message= +tutti.action.deleteProtocol.title= +tutti.action.editCatches= +tutti.action.editCruise= +tutti.action.editFishingOperation.tip= +tutti.action.editProgram= +tutti.action.editProtocol= +tutti.action.editSelectedCruise= +tutti.action.editSelectedProgram= +tutti.action.editSelectedProtocol= +tutti.action.exit= +tutti.action.exportDb= +tutti.action.exportProtocol= +tutti.action.exportProtocolAllCaracteristic= +tutti.action.exportProtocolCaracteristic= +tutti.action.exportProtocolSpecies= +tutti.action.exportTemporaryGearExample= +tutti.action.exportTemporaryPersonExample= +tutti.action.exportTemporarySpeciesExample= +tutti.action.exportTemporaryVesselExample= +tutti.action.generate= +tutti.action.generateCampaignName= +tutti.action.importCasino= +tutti.action.importProtocol= +tutti.action.importProtocolCaracteristic= +tutti.action.importProtocolSpecies= +tutti.action.importPupitri= +tutti.action.importTemporaryGear= +tutti.action.importTemporaryPerson= +tutti.action.importTemporaryReferential= +tutti.action.importTemporarySpecies= +tutti.action.importTemporaryVessel= +tutti.action.installDb= +tutti.action.manageDb= +tutti.action.newCruise= +tutti.action.newProgram= +tutti.action.newProtocol= +tutti.action.openDb= +tutti.action.reload.actions= +tutti.action.reload.application= +tutti.action.reload.ui= +tutti.action.removeCaracteristic= +tutti.action.removeSpeciesBatch= +tutti.action.removeSpeciesSubBatch= +tutti.action.renameSpeciesBatch= +tutti.action.reset.editFishingOperation= +tutti.action.reset.editFishingOperation.tip= +tutti.action.reset.fishingOperationValidState= +tutti.action.save= +tutti.action.saveCatchBatch= +tutti.action.saveCruise= +tutti.action.saveFishingOperation= +tutti.action.saveProgram= +tutti.action.saveProtocol= +tutti.action.selectCruise= +tutti.action.selectOtherSpecies= +tutti.action.showHelp= +tutti.action.site= +tutti.action.splitSpeciesBatch= +tutti.action.updateApplication= +tutti.action.upgradeDb= +tutti.action.validate= +tutti.action.validateCatches= +tutti.application.config= +tutti.application.name= +tutti.common.error= +tutti.config.category.applications= +tutti.config.category.applications.description= +tutti.config.category.shortcuts= +tutti.config.category.shortcuts.description= +tutti.config.category.ui= +tutti.config.category.ui.description= +tutti.dialog.askCancelEditBeforeLeaving.cancelEditCatchBatch= +tutti.dialog.askCancelEditBeforeLeaving.cancelEditFishingOperation= +tutti.dialog.askCancelEditBeforeLeaving.cancelSaveCruise= +tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProgram= +tutti.dialog.askCancelEditBeforeLeaving.cancelSaveProtocol= +tutti.dialog.askCancelEditBeforeLeaving.help= +tutti.dialog.askCancelEditBeforeLeaving.title= +tutti.dialog.askOverwriteFile.help= +tutti.dialog.askOverwriteFile.message= +tutti.dialog.askOverwriteFile.title= +tutti.dialog.askSaveBeforeLeaving.createFishingOperation= +tutti.dialog.askSaveBeforeLeaving.help= +tutti.dialog.askSaveBeforeLeaving.saveCatchBatch= +tutti.dialog.askSaveBeforeLeaving.saveCruise= +tutti.dialog.askSaveBeforeLeaving.saveFishingOperation= +tutti.dialog.askSaveBeforeLeaving.saveProgram= +tutti.dialog.askSaveBeforeLeaving.saveProtocol= +tutti.dialog.askSaveBeforeLeaving.title= +tutti.dialog.catches.species.split.weightNotNull.message= +tutti.dialog.catches.species.split.weightNotNull.title= +tutti.dialog.createMelag.error.message= +tutti.dialog.createMelag.error.title= +tutti.dialog.createMelag.message= +tutti.dialog.createMelag.title= +tutti.duration.format= +tutti.error.errorpane.htmlmessage= +tutti.file.csv= +tutti.file.protocol= +tutti.file.zip= +tutti.flash.information.all.caractristic.exported= +tutti.flash.information.caracteristic.imported.in.protocol= +tutti.flash.information.caractristic.exported.from.protocol= +tutti.flash.information.cruiseCreated= +tutti.flash.information.cruiseSaved= +tutti.flash.information.db.closed= +tutti.flash.information.db.exported= +tutti.flash.information.db.installed.= +tutti.flash.information.db.opened= +tutti.flash.information.programCreated= +tutti.flash.information.programSaved= +tutti.flash.information.protocolCreated= +tutti.flash.information.protocolSaved= +tutti.flash.information.species.add.to.protocol= +tutti.flash.information.species.exported.from.protocol= +tutti.flash.information.species.imported.in.protocol= +tutti.flash.information.species.remove.from.protocol= +tutti.flash.information.species.replaced= +tutti.information.db.loaded= +tutti.information.no.db.exist= +tutti.information.no.db.loaded= +tutti.label.attachmentEditor.file= +tutti.label.attachmentEditor.fileComment= +tutti.label.attachmentEditor.fileName= +tutti.label.catches.benthosTotalSampleSortedWeight= +tutti.label.catches.benthosTotalSortedWeight= +tutti.label.catches.benthosTotalUnsortedWeight= +tutti.label.catches.benthosTotalWeight= +tutti.label.catches.catchTotalRejectedWeight= +tutti.label.catches.catchTotalSortedWeight= +tutti.label.catches.catchTotalUnsortedWeight= +tutti.label.catches.catchTotalWeight= +tutti.label.catches.macroWasteTotalWeight= +tutti.label.catches.planktonTotalSampleWeight= +tutti.label.catches.planktonTotalWeight= +tutti.label.catches.speciesTotalInertWeight= +tutti.label.catches.speciesTotalLivingNotItemizedWeight= +tutti.label.catches.speciesTotalSampleSortedWeight= +tutti.label.catches.speciesTotalSortedWeight= +tutti.label.catches.speciesTotalUnsortedWeight= +tutti.label.catches.speciesTotalWeight= +tutti.label.comment= +tutti.label.createSpeciesBatch.batchWeight= +tutti.label.createSpeciesBatch.sortedUnsortedCategory= +tutti.label.createSpeciesBatch.species= +tutti.label.cruise= +tutti.label.cruise.beginDate= +tutti.label.cruise.country= +tutti.label.cruise.endDate= +tutti.label.cruise.multirigNumber= +tutti.label.cruise.name= +tutti.label.cruise.program= +tutti.label.cruise.surveyPart= +tutti.label.cruise.year= +tutti.label.filterSpeciesBatchMode.label= +tutti.label.filterSpeciesBatchMode.mode.all= +tutti.label.filterSpeciesBatchMode.mode.leaf= +tutti.label.filterSpeciesBatchMode.mode.root= +tutti.label.filterVesselType= +tutti.label.filterVesselType.all= +tutti.label.filterVesselType.all.tip= +tutti.label.filterVesselType.fishing= +tutti.label.filterVesselType.fishing.tip= +tutti.label.filterVesselType.scientific= +tutti.label.filterVesselType.scientific.tip= +tutti.label.fishingOperation.duration= +tutti.label.fishingOperation.fishingOperationInvalid= +tutti.label.fishingOperation.fishingOperationNumber= +tutti.label.fishingOperation.fishingOperationRectiligne= +tutti.label.fishingOperation.fishingOperationValid= +tutti.label.fishingOperation.fishingOperationValidity= +tutti.label.fishingOperation.gear= +tutti.label.fishingOperation.gearDate= +tutti.label.fishingOperation.gearLatitude= +tutti.label.fishingOperation.gearLongitude= +tutti.label.fishingOperation.gearShootingEnd= +tutti.label.fishingOperation.gearShootingEndDate= +tutti.label.fishingOperation.gearShootingEndLatitude= +tutti.label.fishingOperation.gearShootingEndLatitudeDegree= +tutti.label.fishingOperation.gearShootingEndLatitudeMinute= +tutti.label.fishingOperation.gearShootingEndLatitudeSecond= +tutti.label.fishingOperation.gearShootingEndLongitude= +tutti.label.fishingOperation.gearShootingEndLongitudeDegree= +tutti.label.fishingOperation.gearShootingEndLongitudeMinute= +tutti.label.fishingOperation.gearShootingEndLongitudeSecond= +tutti.label.fishingOperation.gearShootingStart= +tutti.label.fishingOperation.gearShootingStartDate= +tutti.label.fishingOperation.gearShootingStartLatitude= +tutti.label.fishingOperation.gearShootingStartLatitudeDegree= +tutti.label.fishingOperation.gearShootingStartLatitudeMinute= +tutti.label.fishingOperation.gearShootingStartLatitudeSecond= +tutti.label.fishingOperation.gearShootingStartLongitude= +tutti.label.fishingOperation.gearShootingStartLongitudeDegree= +tutti.label.fishingOperation.gearShootingStartLongitudeMinute= +tutti.label.fishingOperation.gearShootingStartLongitudeSecond= +tutti.label.fishingOperation.gearTime= +tutti.label.fishingOperation.location= +tutti.label.fishingOperation.multirigAggregation= +tutti.label.fishingOperation.other= +tutti.label.fishingOperation.stationNumber= +tutti.label.fishingOperation.strata= +tutti.label.fishingOperation.subStrata= +tutti.label.fishingOperation.trawlDistance= +tutti.label.fishingOperation.vessel= +tutti.label.frequencyConfiguration.lengthStepCaracteristic= +tutti.label.frequencyConfiguration.maxStep= +tutti.label.frequencyConfiguration.minStep= +tutti.label.frequencyConfiguration.mode.autoGen= +tutti.label.frequencyConfiguration.mode.autoGen.tip= +tutti.label.frequencyConfiguration.mode.rafale= +tutti.label.frequencyConfiguration.mode.rafale.tip= +tutti.label.frequencyConfiguration.mode.simple= +tutti.label.frequencyConfiguration.mode.simple.tip= +tutti.label.frequencyConfiguration.mode.simpleCounting= +tutti.label.frequencyConfiguration.mode.simpleCounting.tip= +tutti.label.frequencyConfiguration.no.configuration= +tutti.label.frequencyConfiguration.rafaleStep= +tutti.label.frequencyConfiguration.step= +tutti.label.list.gear= +tutti.label.list.headOfMission= +tutti.label.list.headOfSortRoom= +tutti.label.list.recorderPerson= +tutti.label.list.vessel= +tutti.label.no.fishingOperation.selected= +tutti.label.program= +tutti.label.program.name= +tutti.label.program.zone= +tutti.label.protocol= +tutti.label.protocol.clone.warning= +tutti.label.protocol.import.warning= +tutti.label.protocol.name= +tutti.label.referential.gear= +tutti.label.referential.person= +tutti.label.referential.species= +tutti.label.referential.vessel= +tutti.label.sampleCategoryConfiguration.batchWeight= +tutti.label.sampleCategoryConfiguration.category= +tutti.label.sampleCategoryConfiguration.sampleWeight= +tutti.label.sampleCategoryConfiguration.species= +tutti.label.tab.accidentel= +tutti.label.tab.benthos= +tutti.label.tab.catches= +tutti.label.tab.catchesCaracteristics= +tutti.label.tab.fishingOperation= +tutti.label.tab.fishingOperation.gearUseFeature= +tutti.label.tab.fishingOperation.general= +tutti.label.tab.fishingOperation.vesselUseFeature= +tutti.label.tab.macroDechet= +tutti.label.tab.observationIndividuel= +tutti.label.tab.plancton= +tutti.label.tab.protocol.accidental= +tutti.label.tab.protocol.benthos= +tutti.label.tab.protocol.caracteristic= +tutti.label.tab.protocol.caracteristic.gearUseFeature= +tutti.label.tab.protocol.caracteristic.lengthClasses= +tutti.label.tab.protocol.caracteristic.vesselUseFeature= +tutti.label.tab.protocol.info= +tutti.label.tab.protocol.plankton= +tutti.label.tab.protocol.species= +tutti.label.tab.species= +tutti.label.traitReminder= +tutti.label.traitReminder.inCreation= +tutti.legend.catch.benthos= +tutti.legend.catch.macroWaste= +tutti.legend.catch.species= +tutti.legend.catch.total= +tutti.legend.frequencyConfiguration= +tutti.legend.splitSpeciesBatchConfiguration= +tutti.menu.actions= +tutti.menu.administration= +tutti.menu.changeLocale= +tutti.menu.file= +tutti.menu.help= +tutti.message.action.running= +tutti.option.cruiseId.description= +tutti.option.help.directory.description= +tutti.option.i18n.directory.description= +tutti.option.i18n.locale.description= +tutti.option.launch.mode.description= +tutti.option.programId.description= +tutti.option.protocolId.description= +tutti.option.ui.autoPopupNumberEditor.description= +tutti.option.ui.color.blockingLayer.description= +tutti.option.ui.color.cellWithValue.description= +tutti.option.ui.color.computedWeights.description= +tutti.option.ui.color.rowInvalid.description= +tutti.option.ui.color.rowReadOnly.description= +tutti.option.ui.color.rowToConfirm.description= +tutti.option.ui.config.file.description= +tutti.option.ui.coordinateEditorType.description= +tutti.option.ui.dateFormat.description= +tutti.option.ui.shortcut.closePopup.description= +tutti.option.ui.showNumberEditorButton.description= +tutti.option.update.url.description= +tutti.sampleCategoryType.age= +tutti.sampleCategoryType.maturity= +tutti.sampleCategoryType.sex= +tutti.sampleCategoryType.size= +tutti.sampleCategoryType.sortedUnsorted= +tutti.table.accidental.batch.header.comment= +tutti.table.accidental.batch.header.file= +tutti.table.accidental.batch.header.speciesByCode= +tutti.table.accidental.batch.header.speciesByGenusCode= +tutti.table.accidental.batch.header.weight= +tutti.table.benthos.batch.header.comment= +tutti.table.benthos.batch.header.file= +tutti.table.benthos.batch.header.number= +tutti.table.benthos.batch.header.sampleWeight= +tutti.table.benthos.batch.header.speciesByCode= +tutti.table.benthos.batch.header.speciesByGenusCode= +tutti.table.benthos.batch.header.toConfirm= +tutti.table.benthos.batch.header.weight= +tutti.table.fishing.gearUseFeature.header.key= +tutti.table.fishing.gearUseFeature.header.value= +tutti.table.fishing.vesselUseFeature.header.key= +tutti.table.fishing.vesselUseFeature.header.value= +tutti.table.macrowaste.batch.header.comment= +tutti.table.macrowaste.batch.header.file= +tutti.table.macrowaste.batch.header.macroWasteCategory= +tutti.table.macrowaste.batch.header.macroWasteSizeCategory= +tutti.table.macrowaste.batch.header.number= +tutti.table.macrowaste.batch.header.weight= +tutti.table.plankton.batch.header.comment= +tutti.table.plankton.batch.header.file= +tutti.table.plankton.batch.header.sampleWeight= +tutti.table.plankton.batch.header.speciesByCode= +tutti.table.plankton.batch.header.speciesByGenusCode= +tutti.table.plankton.batch.header.toConfirm= +tutti.table.plankton.batch.header.weight= +tutti.table.protocol.species.header.age= +tutti.table.protocol.species.header.age.tip= +tutti.table.protocol.species.header.calcifySample= +tutti.table.protocol.species.header.calcifySample.tip= +tutti.table.protocol.species.header.countIfNoFrequency= +tutti.table.protocol.species.header.countIfNoFrequency.tip= +tutti.table.protocol.species.header.lengthStep= +tutti.table.protocol.species.header.lengthStep.tip= +tutti.table.protocol.species.header.maturity= +tutti.table.protocol.species.header.maturity.tip= +tutti.table.protocol.species.header.sex= +tutti.table.protocol.species.header.sex.tip= +tutti.table.protocol.species.header.size= +tutti.table.protocol.species.header.size.tip= +tutti.table.protocol.species.header.speciesReferenceTaxonId= +tutti.table.protocol.species.header.speciesReferenceTaxonId.tip= +tutti.table.protocol.species.header.speciesSurveyCode= +tutti.table.protocol.species.header.speciesSurveyCode.tip= +tutti.table.protocol.species.header.weight= +tutti.table.protocol.species.header.weight.tip= +tutti.table.species.batch.header.ageCategory= +tutti.table.species.batch.header.comment= +tutti.table.species.batch.header.computedNumber= +tutti.table.species.batch.header.file= +tutti.table.species.batch.header.maturityCategory= +tutti.table.species.batch.header.sexCategory= +tutti.table.species.batch.header.sizeCategory= +tutti.table.species.batch.header.sortedUnsortedCategory= +tutti.table.species.batch.header.species= +tutti.table.species.batch.header.toConfirm= +tutti.table.species.batch.header.weight= +tutti.table.species.frequency.header.lengthStep= +tutti.table.species.frequency.header.number= +tutti.table.species.frequency.header.weight= +tutti.table.species.sampleCategory.header.category= +tutti.table.species.sampleCategory.header.selected= +tutti.table.species.sampleCategory.header.weight= +tutti.timeeditor.H= +tutti.title.about= +tutti.title.about.translate=Translate Tutti +tutti.title.attachment= +tutti.title.choose.dbExportFile= +tutti.title.choose.exportTemporaryGearExampleFile= +tutti.title.choose.exportTemporaryPersonExampleFile= +tutti.title.choose.exportTemporarySpeciesExampleFile= +tutti.title.choose.exportTemporaryVesselExampleFile= +tutti.title.choose.importTemporaryGearFile= +tutti.title.choose.importTemporaryPersonFile= +tutti.title.choose.importTemporarySpeciesFile= +tutti.title.choose.importTemporaryVesselFile= +tutti.title.choose.protocolCaracteristicExportFile= +tutti.title.choose.protocolCaracteristicImportFile= +tutti.title.choose.protocolExportFile= +tutti.title.choose.protocolImportFile= +tutti.title.choose.protocolSpeciesExportFile= +tutti.title.choose.protocolSpeciesImportFile= +tutti.title.create.cruise= +tutti.title.create.program= +tutti.title.create.protocol= +tutti.title.createBatch= +tutti.title.edit.cruise= +tutti.title.edit.operations= +tutti.title.edit.program= +tutti.title.edit.protocol= +tutti.title.editFrequency= +tutti.title.home= +tutti.title.import.temporary.referential= +tutti.title.manageDb= +tutti.title.noSelectedCruise= +tutti.title.noSelectedProgram= +tutti.title.noSelectedProtocol= +tutti.title.nodb= +tutti.title.selectSpecies= +tutti.title.selectedCruise= +tutti.title.selectedProgram= +tutti.title.selectedProtocol= +tutti.title.splitBatch= +tutti.title.validate.operations= +tutti.to.be.done= +tutti.tooltip.attachment.none= +tutti.tooltip.comment.none= +tutti.tooltip.distanceInMilles= +tutti.ui.common.error= +tutti.validator.error.comment.too.long= +tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue= +tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required= +tutti.validator.error.createSpeciesBatch.species.required= +tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable= +tutti.validator.error.cruise.beginDate.required= +tutti.validator.error.cruise.country.required= +tutti.validator.error.cruise.dates.endBeforeStart= +tutti.validator.error.cruise.endDate.required= +tutti.validator.error.cruise.gear.required= +tutti.validator.error.cruise.headOfMission.required= +tutti.validator.error.cruise.headOfSortRoom.required= +tutti.validator.error.cruise.multirigNumber.required= +tutti.validator.error.cruise.name.required= +tutti.validator.error.cruise.program.required= +tutti.validator.error.cruise.vessel.required= +tutti.validator.error.cruise.year.required= +tutti.validator.error.fishingOperation.catcher.required= +tutti.validator.error.fishingOperation.comment.required= +tutti.validator.error.fishingOperation.date.end.required= +tutti.validator.error.fishingOperation.date.start.required= +tutti.validator.error.fishingOperation.dates.endBeforeStart= +tutti.validator.error.fishingOperation.dates.endOutOfCruiseDates= +tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates= +tutti.validator.error.fishingOperation.dates.wrongTime= +tutti.validator.error.fishingOperation.existingKey= +tutti.validator.error.fishingOperation.fishingOperationNumber.required= +tutti.validator.error.fishingOperation.fishingOperationValid.required= +tutti.validator.error.fishingOperation.gear.required= +tutti.validator.error.fishingOperation.stationNumber.required= +tutti.validator.error.fishingOperation.stationNumber.too.long= +tutti.validator.error.fishingOperation.strataLocation.required= +tutti.validator.error.fishingOperation.trawlDistance.required= +tutti.validator.error.fishingOperation.trawlDistance.tooLong= +tutti.validator.error.fishingOperation.trawlNetNumber.required= +tutti.validator.error.fishingOperation.vessel.required= +tutti.validator.error.latitude.end.required= +tutti.validator.error.latitude.start.required= +tutti.validator.error.longitude.end.required= +tutti.validator.error.longitude.start.required= +tutti.validator.error.program.comment.required= +tutti.validator.error.program.existingKey= +tutti.validator.error.program.name.required= +tutti.validator.error.program.zone.required= +tutti.validator.error.protocol.name.alreadyUsed= +tutti.validator.error.protocol.name.required= +tutti.validator.error.speciesFrequency.lengthStepCaracteristic.required= +tutti.validator.error.speciesFrequency.oneRowRequired= +tutti.validator.error.splitSpeciesBatch.sampleWeight.invalidValue= +tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight= +tutti.validator.error.splitSpeciesBatch.selectedCategory.required= +tutti.validator.warning.cruise.name.format= +tutti.validator.warning.latitude.degree.outOfBounds= +tutti.validator.warning.latitude.minute.outOfBounds= +tutti.validator.warning.latitude.outOfBounds= +tutti.validator.warning.latitude.second.outOfBounds= +tutti.validator.warning.longitude.degree.outOfBounds= +tutti.validator.warning.longitude.minute.outOfBounds= +tutti.validator.warning.longitude.outOfBounds= +tutti.validator.warning.longitude.second.outOfBounds= +tutti.weights.rate.difference.totalAndSorted.description= +tuttihelp.createSpeciesBatch.action.addSpecies.tip= +tuttihelp.createSpeciesBatch.action.cancel.tip= +tuttihelp.createSpeciesBatch.action.save.tip= +tuttihelp.createSpeciesBatch.field.batchWeightField.tip= +tuttihelp.createSpeciesBatch.field.sortedUnsortedCategoryComboBox.tip= +tuttihelp.createSpeciesBatch.field.speciesComboBox.tip= +tuttihelp.dbManager.action.closeDb.tip= +tuttihelp.dbManager.action.exportDb.tip= +tuttihelp.dbManager.action.installDb.tip= +tuttihelp.dbManager.action.openDb.tip= +tuttihelp.dbManager.action.upgradeDb.tip= +tuttihelp.editCatchBatch.action.cancelEditCatchBatch.tip= +tuttihelp.editCatchBatch.action.computeWeights.tip= +tuttihelp.editCatchBatch.action.importPupitri.tip= +tuttihelp.editCatchBatch.action.saveCatchBatch.tip= +tuttihelp.editCatchBatch.field.benthosTotalSampleSortedWeight.tip= +tuttihelp.editCatchBatch.field.benthosTotalSortedWeight.tip= +tuttihelp.editCatchBatch.field.benthosTotalUnsortedWeight.tip= +tuttihelp.editCatchBatch.field.benthosTotalWeight.tip= +tuttihelp.editCatchBatch.field.catchTotalRejectedWeight.tip= +tuttihelp.editCatchBatch.field.catchTotalSortedWeight.tip= +tuttihelp.editCatchBatch.field.catchTotalUnsortedWeight.tip= +tuttihelp.editCatchBatch.field.catchTotalWeight.tip= +tuttihelp.editCatchBatch.field.macroWasteTotalWeight.tip= +tuttihelp.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= +tuttihelp.editCatchBatch.field.speciesTotalSortedWeight.tip= +tuttihelp.editCatchBatch.field.speciesTotalUnsortedWeight.tip= +tuttihelp.editCatchBatch.field.speciesTotalWeight.tip= +tuttihelp.editCruise.action.cancelEditCruise.tip= +tuttihelp.editCruise.action.generateName.tip= +tuttihelp.editCruise.action.saveCruise.tip= +tuttihelp.editCruise.field.beginDate.tip= +tuttihelp.editCruise.field.comment.tip= +tuttihelp.editCruise.field.country.tip= +tuttihelp.editCruise.field.endDate.tip= +tuttihelp.editCruise.field.multirigNumber.tip= +tuttihelp.editCruise.field.name.tip= +tuttihelp.editCruise.field.program.tip= +tuttihelp.editCruise.field.surveyPart.tip= +tuttihelp.editCruise.field.year.tip= +tuttihelp.editCruise.filterVessel.tip= +tuttihelp.editCruise.list.gear.tip= +tuttihelp.editCruise.list.headOfMission.tip= +tuttihelp.editCruise.list.headOfSortRoom.tip= +tuttihelp.editCruise.list.vessel.tip= +tuttihelp.editFishingOperation.action.attachments.tip= +tuttihelp.editFishingOperation.action.cancelEditFishingOperation.tip= +tuttihelp.editFishingOperation.action.importCasino.tip= +tuttihelp.editFishingOperation.action.saveEditFishingOperation.tip= +tuttihelp.editFishingOperation.field.comment.tip= +tuttihelp.editFishingOperation.field.duration.tip= +tuttihelp.editFishingOperation.field.fishingOperationNumber.tip= +tuttihelp.editFishingOperation.field.fishingOperationRectiligne.tip= +tuttihelp.editFishingOperation.field.fishingOperationValid.tip= +tuttihelp.editFishingOperation.field.gear.tip= +tuttihelp.editFishingOperation.field.gearDate.tip= +tuttihelp.editFishingOperation.field.gearLatitude.tip= +tuttihelp.editFishingOperation.field.gearLongitude.tip= +tuttihelp.editFishingOperation.field.gearShootingEnd.tip= +tuttihelp.editFishingOperation.field.gearShootingEndLatitude.tip= +tuttihelp.editFishingOperation.field.gearShootingEndLongitude.tip= +tuttihelp.editFishingOperation.field.gearShootingStart.tip= +tuttihelp.editFishingOperation.field.gearShootingStartLatitude.tip= +tuttihelp.editFishingOperation.field.gearTime.tip= +tuttihelp.editFishingOperation.field.location.tip= +tuttihelp.editFishingOperation.field.multirigAggregation.tip= +tuttihelp.editFishingOperation.field.stationNumber.tip= +tuttihelp.editFishingOperation.field.strata.tip= +tuttihelp.editFishingOperation.field.subStrata.tip= +tuttihelp.editFishingOperation.field.trawlDistance.tip= +tuttihelp.editFishingOperation.field.vessel.tip= +tuttihelp.editFishingOperation.gearShootingStartLongitude.tip= +tuttihelp.editFishingOperation.list.recorderPerson.tip= +tuttihelp.editProgram.action.cancelEditProgram.tip= +tuttihelp.editProgram.action.saveProgram.tip= +tuttihelp.editProgram.field.comment.tip= +tuttihelp.editProgram.field.name.tip= +tuttihelp.editProgram.field.zone.tip= +tuttihelp.editProtocol.action.addSpeciesProtocol.tip= +tuttihelp.editProtocol.action.cancelEditProtocol.tip= +tuttihelp.editProtocol.action.exportProtocolAllCaracteristic.tip= +tuttihelp.editProtocol.action.exportProtocolCaracteristic.tip= +tuttihelp.editProtocol.action.exportProtocolSpecies.tip= +tuttihelp.editProtocol.action.importProtocolCaracteristic.tip= +tuttihelp.editProtocol.action.importProtocolSpecies.tip= +tuttihelp.editProtocol.action.saveProtocol.tip= +tuttihelp.editProtocol.action.selectOtherSpecies.tip= +tuttihelp.editProtocol.field..tip= +tuttihelp.editProtocol.field.comment.tip= +tuttihelp.editSpeciesBatch.action.createMelag.tip= +tuttihelp.editSpeciesBatch.action.removeSpeciesBatch.tip= +tuttihelp.editSpeciesBatch.action.removeSpeciesSubBatch.tip= +tuttihelp.editSpeciesBatch.action.splitSpeciesBatch.tip= +tuttihelp.editSpeciesBatch.createSpeciesBatch.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalInertWeight.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalSampleSortedWeight.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalSortedWeight.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalUnsortedWeight.tip= +tuttihelp.editSpeciesBatch.field.speciesTotalWeight.tip= +tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.all.tip= +tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.leaf.tip= +tuttihelp.editSpeciesBatch.filterSpeciesBatch.mode.root.tip= +tuttihelp.editSpeciesBatch.filterSpeciesBatch.tip= +tuttihelp.editSpeciesBatch.renameSpeciesBatch.tip= +tuttihelp.fishingOperations.action.newFishingOperation.tip= +tuttihelp.main.action.about.tip= +tuttihelp.main.action.actions.tip= +tuttihelp.main.action.administration.tip= +tuttihelp.main.action.changeLocale.tip= +tuttihelp.main.action.changeLocaleFR.tip= +tuttihelp.main.action.changeLocaleUK.tip= +tuttihelp.main.action.configuration.tip= +tuttihelp.main.action.editCatches.tip= +tuttihelp.main.action.editProgram.tip= +tuttihelp.main.action.editSelectedCruise.tip= +tuttihelp.main.action.editSelectedProtocol.tip= +tuttihelp.main.action.exit.tip= +tuttihelp.main.action.file.tip= +tuttihelp.main.action.help.tip= +tuttihelp.main.action.importTemporaryReferential.tip= +tuttihelp.main.action.manageDb.tip= +tuttihelp.main.action.selectCruise.tip= +tuttihelp.main.action.showHelp.tip= +tuttihelp.main.action.site.tip= +tuttihelp.main.action.updateApplication.tip= +tuttihelp.main.action.validateCatches.tip= +tuttihelp.main.menu.action.site.tip= +tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.tip= +tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.tip= +tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip= +tuttihelp.manageTemporaryReferential.action.exportTemporaryVesselExample.tip= +tuttihelp.manageTemporaryReferential.action.importTemporaryGear.tip= +tuttihelp.manageTemporaryReferential.action.importTemporaryPerson.tip= +tuttihelp.manageTemporaryReferential.action.importTemporarySpecies.tip= +tuttihelp.manageTemporaryReferential.action.importTemporaryVessel.tip= +tuttihelp.manageTemporaryReferential.label.referential.gear.tip= +tuttihelp.manageTemporaryReferential.label.referential.person.tip= +tuttihelp.manageTemporaryReferential.label.referential.species.tip= +tuttihelp.manageTemporaryReferential.label.referential.vessel.tip= +tuttihelp.menu.action.help.tip= +tuttihelp.selectCruise.action.cloneProtocol.tip= +tuttihelp.selectCruise.action.deleteProtocol.tip= +tuttihelp.selectCruise.action.editCatches.tip= +tuttihelp.selectCruise.action.editCruise.tip= +tuttihelp.selectCruise.action.editProgram.tip= +tuttihelp.selectCruise.action.editProtocol.tip= +tuttihelp.selectCruise.action.exportProtocol.tip= +tuttihelp.selectCruise.action.importProtocol.tip= +tuttihelp.selectCruise.action.newCruise.tip= +tuttihelp.selectCruise.action.newProgram.tip= +tuttihelp.selectCruise.action.newProtocol.tip= +tuttihelp.selectCruise.action.validateCatches.tip= +tuttihelp.selectCruise.field.cruise.tip= +tuttihelp.selectCruise.field.program.tip= +tuttihelp.selectCruise.field.protocol.tip= +tuttihelp.splitSpeciesBatch.action.cancel.tip= +tuttihelp.splitSpeciesBatch.action.save.tip= +tuttihelp.splitSpeciesBatch.field.batchWeightField.tip= +tuttihelp.splitSpeciesBatch.field.categoryField.tip= +tuttihelp.splitSpeciesBatch.field.sampleWeightField.tip= +tuttihelp.splitSpeciesBatch.field.speciesField.tip= Property changes on: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-03-11 17:32:12 UTC (rev 580) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-12 09:10:25 UTC (rev 581) @@ -1,6 +1,8 @@ +swing.error.desktop.browse.not.supported= +swing.error.desktop.not.supported= tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> -tutti.action.= +tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/><br/><ul><li>Récupérer le fichier <strong>tutti-i18n.csv</strong> dans le répertoire <strong>i18n</strong></li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul><br/>Nous intégrerons vos modifications avant la prochaine version. tutti.action.about=À propos tutti.action.addSpecies=... tutti.action.attachments=(%s) @@ -11,6 +13,8 @@ tutti.action.cancelEditFishingOperation=Annuler tutti.action.cancelEditProgram=Annuler tutti.action.cancelEditProtocol=Annuler +tutti.action.changeLocaleFR=Français +tutti.action.changeLocaleUK=Anglais tutti.action.chooseDbExportFile=Exporter la base de données tutti.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.action.chooseProtocolFile=Choisir le fichier de protocole @@ -101,6 +105,7 @@ tutti.action.saveProtocol=Enregistrer tutti.action.selectCruise=Sélectionner une campagne tutti.action.selectOtherSpecies=... +tutti.action.showHelp=Aide tutti.action.site=Site tutti.action.splitSpeciesBatch=Catégoriser le lot tutti.action.updateApplication=Vérifier les mises à jour @@ -319,6 +324,7 @@ tutti.legend.splitSpeciesBatchConfiguration=Configuration tutti.menu.actions=Actions tutti.menu.administration=Administration +tutti.menu.changeLocale=Langue tutti.menu.file=Fichier tutti.menu.help=Aide tutti.menu.synchronisationAllegro=Allégro @@ -429,6 +435,7 @@ tutti.table.species.sampleCategory.header.weight=Poids (kg) tutti.timeeditor.H=H tutti.title.about=À propos de Tutti +tutti.title.about.translate=Traduire Tutti tutti.title.attachment=Pièces jointes tutti.title.choose.dbExportFile=Exporter la base de données tutti.title.choose.exportTemporaryGearExampleFile=Exporter un exemple de référentiel Engin @@ -647,9 +654,12 @@ tuttihelp.main.action.about.tip=À Propos tuttihelp.main.action.actions.tip=Actions tuttihelp.main.action.administration.tip=Administrer Tutti +tuttihelp.main.action.changeLocale.tip=Changer de langue +tuttihelp.main.action.changeLocaleFR.tip=Passer en français +tuttihelp.main.action.changeLocaleUK.tip=Passer en anglais tuttihelp.main.action.configuration.tip=Configurer Tutti -tuttihelp.main.action.editCatches.tip= -tuttihelp.main.action.editProgram.tip= +tuttihelp.main.action.editCatches.tip=Editer les catpures +tuttihelp.main.action.editProgram.tip=Editer la série de campagne tuttihelp.main.action.editSelectedCruise.tip=Éditer la campagne sélectionnée tuttihelp.main.action.editSelectedProtocol.tip=Éditer le protocole sélectionné tuttihelp.main.action.exit.tip=Quitter l'application @@ -658,10 +668,10 @@ tuttihelp.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires tuttihelp.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti tuttihelp.main.action.selectCruise.tip=Sélectionner la campagne à utiliser -tuttihelp.main.action.showHelp.tip= +tuttihelp.main.action.showHelp.tip=Accéder à l'aide de l'application tuttihelp.main.action.site.tip=Accéder au site du projet Tutti tuttihelp.main.action.updateApplication.tip=Vérifier les mises à jour logicielles -tuttihelp.main.action.validateCatches.tip= +tuttihelp.main.action.validateCatches.tip=Valider les captures tuttihelp.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin tuttihelp.manageTemporaryReferential.action.exportTemporaryPersonExample.tip=Exporter un exemple de référentiel Personne tuttihelp.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip=Exporter un exemple de référentiel Espèces @@ -674,7 +684,6 @@ tuttihelp.manageTemporaryReferential.label.referential.person.tip= tuttihelp.manageTemporaryReferential.label.referential.species.tip= tuttihelp.manageTemporaryReferential.label.referential.vessel.tip= -tuttihelp.menu.action.help.tip= tuttihelp.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné tuttihelp.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné tuttihelp.selectCruise.action.editCatches.tip=Saisir des captures Added: trunk/tutti-ui-swing/src/main/resources/icons/action-translate.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-translate.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL