r845 - in trunk/tutti-ui-swing/src/main: filtered-resources help/fr java/fr/ifremer/tutti/ui/swing java/fr/ifremer/tutti/ui/swing/content/db java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/protocol java/fr/ifremer/tutti/ui/swing/content/referential resources/i18n
Author: tchemit Date: 2013-04-22 08:53:55 +0200 (Mon, 22 Apr 2013) New Revision: 845 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/845 Log: add missing svn properties + license headers fixes #2343: [ERGO] Proposer le nom d'un fichier pour chaque sauvegarde Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html trunk/tutti-ui-swing/src/main/help/fr/index.html trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 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/content/db/ExportAndCleanDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.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.css 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/home/SendCruiseReportAction.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/ExportProtocolBenthosAction.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/ExportPupitriAction.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/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -22,15 +22,16 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sun Apr 21 13:23:05 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +#Mon Apr 22 08:30:46 CEST 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html\#fields tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions @@ -39,19 +40,19 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html\#fields tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html -tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html\#fields tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions @@ -68,8 +69,9 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions -tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions @@ -175,11 +177,14 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields @@ -242,12 +247,13 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html +tutti.index.help=index.html +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.changeLocale.help=index.html\#menu tutti.main.menu.action.changeLocaleFR.help=index.html\#menu tutti.main.menu.action.changeLocaleUK.help=index.html\#menu -tutti.main.action.showHelp.help=index.html\#menu -tutti.main.help=index.html -tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.configuration.help=index.html\#menu tutti.main.menu.action.editCatches.help=index.html\#menu tutti.main.menu.action.editCruise.help=index.html\#menu @@ -276,6 +282,8 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help= +tutti.selectCruise.action.exportProgram.help= tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -302,9 +310,3 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.config.help=config.html -tutti.editAccidentalBatch.help=editAccidentalBatch.html -tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editPlanktonBatch.help=editPlanktonBatch.html -tutti.index.help=index.html \ No newline at end of file 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -22,15 +22,16 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu Apr 18 16:32:55 CEST 2013 -tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html#actions -tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html#fields -tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html#fields +#Mon Apr 22 08:30:46 CEST 2013 +tutti.config.help=config.html +tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions +tutti.createAccidentalBatch.field.accidentalDeadOrAlive.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalGender.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalLengthStepCaracteristic.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSize.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalSpecies.help=createAccidentalBatch.html\#fields +tutti.createAccidentalBatch.field.accidentalWeight.help=createAccidentalBatch.html\#fields tutti.createAccidentalBatch.help=createAccidentalBatch.html tutti.createBenthosBatch.action.addSpecies.help=createBenthosBatch.html\#actions tutti.createBenthosBatch.action.cancel.help=createBenthosBatch.html\#actions @@ -39,19 +40,19 @@ tutti.createBenthosBatch.field.sortedUnsortedCategory.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.field.species.help=createBenthosBatch.html\#fields tutti.createBenthosBatch.help=createBenthosBatch.html -tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html#actions -tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html#fields -tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html#fields +tutti.createIndividualObservationBatch.action.addSpecies.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.cancel.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.action.save.help=createIndividualObservationBatch.html\#actions +tutti.createIndividualObservationBatch.field.individualObservationLengthStepCaracteristic.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSize.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationSpecies.help=createIndividualObservationBatch.html\#fields +tutti.createIndividualObservationBatch.field.individualObservationWeight.help=createIndividualObservationBatch.html\#fields tutti.createIndividualObservationBatch.help=createIndividualObservationBatch.html -tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html#actions -tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html#fields -tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html#fields +tutti.createMarineLitterBatch.action.cancel.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.action.save.help=createMarineLitterBatch.html\#actions +tutti.createMarineLitterBatch.field.marineLitterCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.marineLitterSizeCategory.help=createMarineLitterBatch.html\#fields +tutti.createMarineLitterBatch.field.number.help=createMarineLitterBatch.html\#fields tutti.createMarineLitterBatch.help=createMarineLitterBatch.html tutti.createSpeciesBatch.action.addSpecies.help=createSpeciesBatch.html\#actions tutti.createSpeciesBatch.action.cancel.help=createSpeciesBatch.html\#actions @@ -68,8 +69,9 @@ tutti.dbManager.action.openDb.help=dbManager.html\#actions tutti.dbManager.action.upgradeDb.help=dbManager.html\#actions tutti.dbManager.help=dbManager.html -tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html#actions -tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html#actions +tutti.editAccidentalBatch.action.createBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.action.removeBatch.help=editAccidentalBatch.html\#actions +tutti.editAccidentalBatch.help=editAccidentalBatch.html tutti.editBenthosBatch.action.createBatch.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.createMelag.help=editBenthosBatch.html\#actions tutti.editBenthosBatch.action.removeBatch.help=editBenthosBatch.html\#actions @@ -175,11 +177,14 @@ tutti.editFishingOperation.field.trawlDistance.help=editFishingOperation.html\#fields tutti.editFishingOperation.field.vessel.help=editFishingOperation.html\#fields tutti.editFishingOperation.help=editFishingOperation.html -tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html#actions -tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html#fields +tutti.editIndividualObservationBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html +tutti.editMarineLitterBatch.action.createBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.action.removeBatch.help=editIndividualObservationBatch.html\#actions +tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help=editIndividualObservationBatch.html\#fields +tutti.editMarineLitterBatch.help=editMarineLitterBatch.html +tutti.editPlanktonBatch.help=editPlanktonBatch.html tutti.editProgram.action.cancelProgram.help=editProgram.html\#actions tutti.editProgram.action.saveProgram.help=editProgram.html\#actions tutti.editProgram.field.description.help=editProgram.html\#fields @@ -242,12 +247,13 @@ tutti.fishingOperations.action.newFishingOperation.help=fishingOperations.html\#actions tutti.fishingOperations.field.fishingOperation.help=fishingOperations.html\#fields tutti.fishingOperations.help=fishingOperations.html +tutti.index.help=index.html +tutti.main.action.showHelp.help=index.html\#menu +tutti.main.help=index.html +tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.changeLocale.help=index.html\#menu tutti.main.menu.action.changeLocaleFR.help=index.html\#menu tutti.main.menu.action.changeLocaleUK.help=index.html\#menu -tutti.main.action.showHelp.help=index.html\#menu -tutti.main.help=index.html -tutti.main.menu.action.about.help=index.html\#menu tutti.main.menu.action.configuration.help=index.html\#menu tutti.main.menu.action.editCatches.help=index.html\#menu tutti.main.menu.action.editCruise.help=index.html\#menu @@ -276,6 +282,8 @@ tutti.selectCruise.action.editCruise.help=selectCruise.html\#actions tutti.selectCruise.action.editProgram.help=selectCruise.html\#actions tutti.selectCruise.action.editProtocol.help=selectCruise.html\#actions +tutti.selectCruise.action.exportCruise.help= +tutti.selectCruise.action.exportProgram.help= tutti.selectCruise.action.exportProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.importProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.newCruise.help=selectCruise.html\#actions @@ -302,9 +310,3 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.config.help=config.html -tutti.editAccidentalBatch.help=editAccidentalBatch.html -tutti.editIndividualObservationBatch.help=editIndividualObservationBatch.html -tutti.editMarineLitterBatch.help=editMarineLitterBatch.html -tutti.editPlanktonBatch.help=editPlanktonBatch.html -tutti.index.help=index.html Modified: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createAccidentalBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createBenthosBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createIndividualObservationBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/createMarineLitterBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editBenthosFrequencies.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/editIndividualObservationBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/index.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/index.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/index.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html 2013-04-22 06:53:55 UTC (rev 845) @@ -1,3 +1,26 @@ +<!-- + #%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"> Property changes on: trunk/tutti-ui-swing/src/main/help/fr/splitBenthosBatch.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-04-22 06:53:55 UTC (rev 845) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.service.catches.ExportCatchesReportService; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; +import fr.ifremer.tutti.service.export.TuttiExportService; import fr.ifremer.tutti.service.protocol.TuttiProtocolImportExportService; import fr.ifremer.tutti.service.pupitri.TuttiPupitriImportExportService; import fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService; @@ -537,6 +538,10 @@ return serviceContext.getService(ExportCatchesReportService.class); } + public TuttiExportService getTuttiExportService() { + return serviceContext.getService(TuttiExportService.class); + } + public boolean useRealPersistenceService() { return isDbExist() && isDbLoaded(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportAndCleanDbAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -37,6 +37,9 @@ import org.apache.commons.logging.LogFactory; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -49,8 +52,11 @@ public class ExportAndCleanDbAction extends AbstractMainUITuttiAction { /** Logger. */ - private static final Log log = LogFactory.getLog(ExportAndCleanDbAction.class); + private static final Log log = + LogFactory.getLog(ExportAndCleanDbAction.class); + public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd"); + protected File file; public ExportAndCleanDbAction(MainUIHandler handler) { @@ -67,7 +73,8 @@ // ask user file where to export db // choose file to import - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tutti-db-" + df.format(new Date()) + ".zip", getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ExportDbAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -34,6 +34,9 @@ import org.apache.commons.logging.LogFactory; import java.io.File; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import static org.nuiton.i18n.I18n._; @@ -50,6 +53,8 @@ protected File file; + public static final DateFormat df = new SimpleDateFormat("yyy-MM-dd"); + public ExportDbAction(MainUIHandler handler) { super(handler, true); } @@ -64,7 +69,8 @@ // ask user file where to export db // choose file to import - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tutti-db-" + df.format(new Date()) + ".zip", getContext().getMainUI(), _("tutti.dbManager.title.choose.dbExportFile"), _("tutti.dbManager.action.chooseDbExportFile"), Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -0,0 +1,116 @@ +package fr.ifremer.tutti.ui.swing.content.home; + +/* + * #%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 com.google.common.base.Preconditions; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.service.export.TuttiExportService; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * To export a selected cruise. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.0 + */ +public class ExportCruiseAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportCruiseAction.class); + + protected File file; + + public ExportCruiseAction(SelectCruiseUIHandler handler) { + super(handler, true); + } + + @Override + protected boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + if (doAction) { + + Cruise cruise = getModel().getCruise(); + + // choose file to export + file = TuttiUIUtil.saveFile( + "exportCruise-" + cruise.getName() + ".zip", + getContext().getMainUI(), + _("tutti.selectCruise.title.choose.exportCruiseFile"), + _("tutti.selectCruise.action.chooseCruiseExportFile"), + "^.+\\.zip$", _("tutti.common.file.zip") + ); + doAction = file != null; + if (doAction) { + file = TuttiIOUtil.addExtensionIfMissing(file, ".zip"); + + // ask user to confirm overwrite. + doAction = getHandler().askOverwriteFile(file); + } + } + return doAction; + } + + @Override + protected void releaseAction() { + file = null; + super.releaseAction(); + } + + @Override + protected void doAction() throws Exception { + Cruise cruise = getModel().getCruise(); + Preconditions.checkNotNull(cruise); + Preconditions.checkNotNull(file); + + if (log.isInfoEnabled()) { + log.info("Will save cruise " + cruise.getId() + + " to file: " + file); + } + + // export cruise + TuttiExportService service = getContext().getTuttiExportService(); + service.exportCruise(cruise.getId(), file); + + getHandler().resetEditCruiseAction(); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + Cruise cruise = getModel().getCruise(); + sendMessage(_("tutti.exportCruise.action.success", + cruise.getName(), file.getName())); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseAction.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/home/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -0,0 +1,115 @@ +package fr.ifremer.tutti.ui.swing.content.home; + +/* + * #%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 com.google.common.base.Preconditions; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.service.export.TuttiExportService; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +import static org.nuiton.i18n.I18n._; + +/** + * To export a selected program. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.0 + */ +public class ExportProgramAction extends AbstractTuttiAction<SelectCruiseUIModel, SelectCruiseUI, SelectCruiseUIHandler> { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportProgramAction.class); + + protected File file; + + public ExportProgramAction(SelectCruiseUIHandler handler) { + super(handler, true); + } + + @Override + protected boolean prepareAction() throws Exception { + + boolean doAction = super.prepareAction(); + + Program program = getModel().getProgram(); + if (doAction) { + + // choose file to export + file = TuttiUIUtil.saveFile( + "exportProgram-" + program.getName() + ".zip", + getContext().getMainUI(), + _("tutti.selectCruise.title.choose.exportProgramFile"), + _("tutti.selectCruise.action.chooseProgramExportFile"), + "^.+\\.zip$", _("tutti.common.file.zip") + ); + doAction = file != null; + if (doAction) { + file = TuttiIOUtil.addExtensionIfMissing(file, ".zip"); + + // ask user to confirm overwrite. + doAction = getHandler().askOverwriteFile(file); + } + } + return doAction; + } + + @Override + protected void releaseAction() { + file = null; + super.releaseAction(); + } + + @Override + protected void doAction() throws Exception { + Program program = getModel().getProgram(); + Preconditions.checkNotNull(program); + Preconditions.checkNotNull(file); + + if (log.isInfoEnabled()) { + log.info("Will save program " + program.getId() + + " to file: " + file); + } + + // export cruise + TuttiExportService service = getContext().getTuttiExportService(); + service.exportProgram(program.getId(), file); + + getHandler().resetEditProgramAction(); + } + + @Override + public void postSuccessAction() { + super.postSuccessAction(); + Program program = getModel().getProgram(); + sendMessage(_("tutti.exportProgram.action.success", program.getName(), + file.getName())); + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProgramAction.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/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,11 +62,13 @@ if (doAction) { + TuttiProtocol protocol = getModel().getProtocol(); // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "protocol-" + protocol.getName().replaceAll(" ", "_") + ".tuttiProtocol", getContext().getMainUI(), _("tutti.selectCruise.title.choose.exportFile"), - _("tutti.selectCruise.action.chooseProtocolFile"), + _("tutti.selectCruise.action.exportProtocol"), "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); doAction = file != null; 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -69,7 +69,7 @@ file = TuttiUIUtil.chooseFile( getContext().getMainUI(), _("tutti.selectCruise.title.choose.importFile"), - _("tutti.selectCruise.action.chooseProtocolFile"), + _("tutti.selectCruise.action.importProtocol"), "^.+\\.tuttiProtocol$", _("tutti.common.file.protocol") ); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-22 06:53:55 UTC (rev 845) @@ -58,6 +58,12 @@ _validatorLabel: {_("tutti.selectCruise.field.program")}; } +#editProgramComboBox { + model: {handler.newComboModel(editProgramButton, exportProgramButton)}; + enabled: {model.isProgramFound()}; + renderer: {new ActionListCellRenderer()}; +} + #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; @@ -67,6 +73,15 @@ _help: {"tutti.selectCruise.action.editProgram.help"}; } +#exportProgramButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportProgram"; + enabled: {model.isProgramFound()}; + _tuttiAction: {ExportProgramAction.class}; + toolTipText: "tutti.selectCruise.action.exportProgram.tip"; + _help: {"tutti.selectCruise.action.exportProgram.help"}; +} + #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; @@ -91,7 +106,7 @@ } #editCruiseComboBox { - model: {handler.newComboModel(editCruiseButton, sendCruiseReportButton)}; + model: {handler.newComboModel(editCruiseButton, exportCruiseButton, sendCruiseReportButton)}; enabled: {model.isProgramFound() && model.isCruiseFound()}; renderer: {new ActionListCellRenderer()}; } @@ -104,6 +119,14 @@ _help: {"tutti.selectCruise.action.editCruise.help"}; } +#exportCruiseButton { + actionIcon: export; + text: "tutti.selectCruise.action.exportCruise"; + _tuttiAction: {ExportCruiseAction.class}; + toolTipText: "tutti.selectCruise.action.exportCruise.tip"; + _help: {"tutti.selectCruise.action.exportCruise.help"}; +} + #sendCruiseReportButton { actionIcon: email; text: "tutti.selectCruise.action.sendCruiseReport"; 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-04-22 06:53:55 UTC (rev 845) @@ -73,7 +73,10 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.selectCruise.help"'/> + <JButton id='editProgramButton'/> + <JButton id='exportProgramButton'/> <JButton id='editCruiseButton'/> + <JButton id='exportCruiseButton'/> <JButton id='sendCruiseReportButton'/> <JButton id='newProtocolButton'/> <JButton id='importProtocolButton'/> @@ -100,7 +103,10 @@ </cell> <cell> <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='editProgramButton'/> + <JComboBox id='editProgramComboBox' + onMouseEntered='if (editProgramComboBox.isEnabled()) { editProgramComboBox.showPopup(); }' + onMouseClicked='if (editProgramComboBox.isEnabled()) { handler.startEditProgramAction(event); }' + onActionPerformed='handler.startEditProgramAction(event)'/> <JButton id='newProgramButton'/> </JPanel> </cell> 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-22 06:53:55 UTC (rev 845) @@ -165,6 +165,7 @@ model.getProtocol()); ui.getEditCruiseComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); + ui.getEditProgramComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); @@ -249,6 +250,10 @@ protected boolean resetEditProtolAction; + protected boolean resetEditProgramAction; + + protected boolean resetEditCruiseAction; + public void resetEditProtolAction() { resetEditProtolAction = true; try { @@ -258,6 +263,24 @@ } } + public void resetEditCruiseAction() { + resetEditCruiseAction = true; + try { + ui.getEditCruiseComboBox().setSelectedIndex(0); + } finally { + resetEditCruiseAction = false; + } + } + + public void resetEditProgramAction() { + resetEditProgramAction = true; + try { + ui.getEditCruiseComboBox().setSelectedIndex(0); + } finally { + resetEditProgramAction = false; + } + } + @Override public void onCloseUI() { if (log.isDebugEnabled()) { @@ -270,6 +293,23 @@ clearValidators(); } + public void startEditProgramAction(MouseEvent event) { + JComboBox existingProgramCombo = (JComboBox) event.getSource(); + TuttiActionHelper.runAction((AbstractButton) existingProgramCombo.getItemAt(0)); + } + + public void startEditProgramAction(ActionEvent event) { + JComboBox existingProgramCombo = (JComboBox) event.getSource(); + JButton selectedAction = (JButton) existingProgramCombo.getSelectedItem(); + // hide popup before performing the action, otherwise, if the action + // opens a popup, the user must click a first time to hide the combobox + // popup to then interact with the popup opened by the action + // (see http://forge.codelutin.com/issues/2032) + existingProgramCombo.setSelectedIndex(0); + existingProgramCombo.hidePopup(); + TuttiActionHelper.runAction(selectedAction); + } + public void startEditCruiseAction(MouseEvent event) { JComboBox existingCruiseCombo = (JComboBox) event.getSource(); TuttiActionHelper.runAction((AbstractButton) existingCruiseCombo.getItemAt(0)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SendCruiseReportAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,8 +62,10 @@ if (doAction) { + Cruise cruise = getModel().getCruise(); // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportCruise-" + cruise.getName() + ".pdf", getContext().getMainUI(), _("tutti.sendCruiseReport.title.choose.exportFile"), _("tutti.sendCruiseReport.action.chooseFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportAllCaracteristicAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -62,7 +62,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-allCaracteristics.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolBenthosAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -65,7 +65,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-benthos.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.benthosExportFile"), _("tutti.editProtocol.action.chooseProtocolBenthosFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolCaracteristicAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-caracteristics.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.caracteristicExportFile"), _("tutti.editProtocol.action.chooseProtocolCaracteristicFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportProtocolSpeciesAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -65,7 +65,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-species.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesExportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/ExportPupitriAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -64,7 +64,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "tuttiProtocol-" + getModel().getName() + "-pupitri.csv", getContext().getMainUI(), _("tutti.editProtocol.title.choose.speciesExportFile"), _("tutti.editProtocol.action.chooseProtocolSpeciesFile") 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryGearExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportGearExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryGearExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialGearFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryPersonExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -64,7 +64,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportPersonExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryPersonExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporarySpeciesExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportSpeciesExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporarySpeciesExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile"), 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ExportTemporaryVesselExampleAction.java 2013-04-22 06:53:55 UTC (rev 845) @@ -63,7 +63,8 @@ if (doAction) { // choose file to export - file = TuttiUIUtil.chooseFile( + file = TuttiUIUtil.saveFile( + "exportVesselExample.csv", getContext().getMainUI(), _("tutti.manageTemporaryReferential.title.choose.exportTemporaryVesselExampleFile"), _("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile"), Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -55,6 +55,7 @@ tutti.common.cancel= tutti.common.cancel.mnemonic= tutti.common.file.csv= +tutti.common.file.export= tutti.common.file.pdf= tutti.common.file.protocol= tutti.common.file.zip= @@ -798,6 +799,8 @@ tutti.error.errorpane.htmlmessage= tutti.error.ui.business.error= tutti.error.ui.other.error= +tutti.exportCruise.action.success= +tutti.exportProgram.action.success= tutti.exportProtocol.action.success= tutti.fishingOperations.action.newFishingOperation.mnemonic= tutti.fishingOperations.action.newFishingOperation.tip= @@ -983,6 +986,8 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= tutti.selectBenthos.title= +tutti.selectCruise.action.chooseCruiseExportFile= +tutti.selectCruise.action.chooseProgramExportFile= tutti.selectCruise.action.chooseProtocolFile= tutti.selectCruise.action.cloneProtocol= tutti.selectCruise.action.cloneProtocol.tip= @@ -999,6 +1004,10 @@ tutti.selectCruise.action.editProgram.tip= tutti.selectCruise.action.editProtocol= tutti.selectCruise.action.editProtocol.tip= +tutti.selectCruise.action.exportCruise= +tutti.selectCruise.action.exportCruise.tip= +tutti.selectCruise.action.exportProgram= +tutti.selectCruise.action.exportProgram.tip= tutti.selectCruise.action.exportProtocol= tutti.selectCruise.action.exportProtocol.tip= tutti.selectCruise.action.importProtocol= @@ -1021,7 +1030,9 @@ tutti.selectCruise.field.protocol= tutti.selectCruise.field.protocol.tip= tutti.selectCruise.title= +tutti.selectCruise.title.choose.exportCruiseFile= tutti.selectCruise.title.choose.exportFile= +tutti.selectCruise.title.choose.exportProgramFile= tutti.selectCruise.title.choose.importFile= tutti.selectCruise.warn.invalid.selected.data= tutti.selectSpecies.action.cancel= 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-04-21 15:12:42 UTC (rev 844) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 06:53:55 UTC (rev 845) @@ -798,6 +798,8 @@ tutti.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur +tutti.exportCruise.action.success=La campagne %s a été exporté dans le fichier %s avec succès. +tutti.exportProgram.action.success=La série de campagne a été exportée dans le fichier %s avec succès. tutti.exportProtocol.action.success=Protocole [%1s] exporté dans le fichier %2s. tutti.fishingOperations.action.newFishingOperation.mnemonic=N tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche @@ -983,7 +985,8 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile=Importer un réferentiel Navire tutti.message.action.running=<html>Action <strong>%s</strong> en cours d'execution...<hr/></html> tutti.selectBenthos.title=Choisissez un benthos -tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole +tutti.selectCruise.action.chooseCruiseExportFile=Exporter +tutti.selectCruise.action.chooseProgramExportFile=Exporter tutti.selectCruise.action.cloneProtocol=Cloner tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné tutti.selectCruise.action.deleteProtocol=Supprimer @@ -999,6 +1002,10 @@ tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné tutti.selectCruise.action.editProtocol=Éditer tutti.selectCruise.action.editProtocol.tip=Éditer le protocole sélectionné +tutti.selectCruise.action.exportCruise=Exporter +tutti.selectCruise.action.exportCruise.tip=Exporter la campagne au format générique +tutti.selectCruise.action.exportProgram=Exporter +tutti.selectCruise.action.exportProgram.tip=Exporter les campagnes de la série au format générique tutti.selectCruise.action.exportProtocol=Exporter tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné tutti.selectCruise.action.importProtocol=Importer @@ -1021,7 +1028,9 @@ tutti.selectCruise.field.protocol=Protocole de saisie tutti.selectCruise.field.protocol.tip=Nom du protocole de saisie tutti.selectCruise.title=Sélection de la campagne +tutti.selectCruise.title.choose.exportCruiseFile=Exporter une campagne tutti.selectCruise.title.choose.exportFile=Exporter le protocole +tutti.selectCruise.title.choose.exportProgramFile=Exporter une série de campagne tutti.selectCruise.title.choose.importFile=Importer le protocole tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. tutti.selectSpecies.action.cancel=Annuler
participants (1)
-
tchemit＠users.forge.codelutin.com