This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 2d5093f146943d4bffd758dbc3f308346e196144 Merge: 32d5576 f75075e Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 22 22:27:22 2014 +0200 Merge branch 'release/3.6' .gitignore | 14 + README.txt | 26 +- pom.xml | 122 ++++--- src/site/rst/dbversions.rst | 10 +- src/site/site_fr.xml | 41 +-- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 20 + .../persistence/TuttiPersistenceNoDbImpl.java | 20 + .../service/AbstractPersistenceService.java | 15 +- .../service/ReferentialPersistenceService.java | 49 ++- .../service/ReferentialPersistenceServiceImpl.java | 133 ++++++- .../src/main/resources/queries-failsafe.hbm.xml | 192 ++++++++++ tutti-service/pom.xml | 4 +- .../ifremer/tutti/service/PersistenceService.java | 35 ++ .../ifremer/tutti/service/ValidationService.java | 78 +++- .../catches/ValidateCruiseOperationsService.java | 91 ++++- .../service/catches/WeightComputingService.java | 4 +- .../TemporaryReferentialFieldValidator.java | 104 ++++++ ...l => AccidentalBatch-edit-error-validation.xml} | 2 +- .../AccidentalBatch-validate-fatal-validation.xml | 20 +- ....xml => BenthosBatch-edit-error-validation.xml} | 0 .../BenthosBatch-validate-fatal-validation.xml | 20 +- ...dation.xml => Cruise-edit-error-validation.xml} | 0 ...on.xml => Cruise-validate-error-validation.xml} | 9 +- .../data/Cruise-validate-fatal-validation.xml | 56 +++ .../FishingOperation-validate-fatal-validation.xml | 25 ++ ...dualObservationBatch-edit-error-validation.xml} | 8 +- ...lObservationBatch-validate-fatal-validation.xml | 20 +- ...=> MarineLitterBatch-edit-error-validation.xml} | 0 ...ation.xml => Program-edit-error-validation.xml} | 0 ....xml => SpeciesBatch-edit-error-validation.xml} | 0 .../SpeciesBatch-validate-fatal-validation.xml | 20 +- .../resources/i18n/tutti-service_en_GB.properties | 22 ++ .../resources/i18n/tutti-service_fr_FR.properties | 23 +- tutti-service/src/main/resources/validators.xml | 2 + .../tutti/service/BeanValidatorDetectorTest.java | 40 +- .../tutti/service/PersistenceServiceTest.java | 404 +++++++++++++++++++++ .../tutti/service/ValidationServiceTest.java | 7 +- tutti-ui-swing/pom.xml | 9 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 3 +- .../filtered-resources/tutti-help-fr.properties | 25 +- .../src/main/filtered-resources/tutti.config | 3 +- .../AbstractOpenReplaceTemporaryUIAction.java | 168 +++++++++ .../action/AbstractReplaceTemporaryUIAction.java | 120 ++++++ .../tutti/ui/swing/action/AbstractTuttiAction.java | 2 + .../tutti/ui/swing/action/EditCruiseAction.java | 2 + .../action/EditCruiseInValidationUIAction.java | 137 +++++++ ... EditFishingOperationInValidationUIAction.java} | 13 +- .../ui/swing/action/EditSelectedCruiseAction.java | 2 + .../tutti/ui/swing/action/NewCruiseAction.java | 2 + .../tutti/ui/swing/action/NewProgramAction.java | 2 + .../action/OpenReplaceTemporaryGearUIAction.java | 73 ++++ .../action/OpenReplaceTemporaryPersonUIAction.java | 73 ++++ .../OpenReplaceTemporarySpeciesUIAction.java | 72 ++++ .../action/OpenReplaceTemporaryVesselUIAction.java | 73 ++++ .../swing/action/ReplaceTemporaryGearAction.java | 62 ++++ .../swing/action/ReplaceTemporaryPersonAction.java | 62 ++++ .../action/ReplaceTemporarySpeciesAction.java | 63 ++++ .../swing/action/ReplaceTemporaryVesselAction.java | 63 ++++ .../tutti/ui/swing/action/ResetCruiseAction.java | 64 ++++ .../tutti/ui/swing/action/ResetProgramAction.java | 64 ++++ .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 10 + .../ui/swing/content/cruise/EditCruiseUI.jaxx | 3 +- .../swing/content/cruise/EditCruiseUIHandler.java | 35 ++ .../ui/swing/content/cruise/EditCruiseUIModel.java | 19 + .../ui/swing/content/cruise/ValidateCruiseUI.css | 4 + .../ui/swing/content/cruise/ValidateCruiseUI.jaxx | 9 +- .../content/cruise/ValidateCruiseUIHandler.java | 204 +++++------ .../content/cruise/ValidateCruiseUIModel.java | 100 +++-- .../swing/content/cruise/tree/CruiseTreeNode.java | 98 +++++ .../swing/content/cruise/tree/MessageTreeNode.java | 57 +++ .../content/cruise/tree/OperationTreeNode.java | 97 +++++ .../cruise/tree/ValidationTreeCellRenderer.java | 88 +++++ .../accidental/AccidentalBatchUIHandler.java | 3 +- .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../IndividualObservationBatchUIHandler.java | 3 +- .../marinelitter/MarineLitterBatchUIHandler.java | 3 +- .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../ui/swing/content/program/EditProgramUI.css | 10 + .../ui/swing/content/program/EditProgramUI.jaxx | 3 +- .../content/program/EditProgramUIHandler.java | 15 +- .../referential/ManageTemporaryReferentialUI.css | 32 ++ .../referential/ManageTemporaryReferentialUI.jaxx | 4 + .../replace/AbstractReplaceTemporaryUI.css | 77 ++++ .../replace/AbstractReplaceTemporaryUI.jaxx | 90 +++++ .../replace/AbstractReplaceTemporaryUIModel.java | 104 ++++++ .../replace/ReplaceTemporaryGearUI.css} | 32 +- .../replace/ReplaceTemporaryGearUI.jaxx | 38 ++ .../replace/ReplaceTemporaryGearUIHandler.java | 85 +++++ .../replace/ReplaceTemporaryGearUIModel.java} | 30 +- .../replace/ReplaceTemporaryPersonUI.css} | 34 +- .../replace/ReplaceTemporaryPersonUI.jaxx | 38 ++ .../replace/ReplaceTemporaryPersonUIHandler.java | 85 +++++ .../replace/ReplaceTemporaryPersonUIModel.java} | 30 +- .../replace/ReplaceTemporarySpeciesUI.css} | 32 +- .../replace/ReplaceTemporarySpeciesUI.jaxx | 38 ++ .../replace/ReplaceTemporarySpeciesUIHandler.java | 85 +++++ .../replace/ReplaceTemporarySpeciesUIModel.java} | 30 +- .../replace/ReplaceTemporaryVesselUI.css} | 32 +- .../replace/ReplaceTemporaryVesselUI.jaxx | 38 ++ .../replace/ReplaceTemporaryVesselUIHandler.java | 85 +++++ .../replace/ReplaceTemporaryVesselUIModel.java} | 30 +- ... EditCruiseUIModel-edit-warning-validation.xml} | 0 ...ctReplaceTemporaryUIModel-error-validation.xml} | 27 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 87 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 46 +++ .../icons/action-observed_fishing_trip.png | Bin 0 -> 3348 bytes .../src/main/resources/icons/action-replace.png | Bin 0 -> 512 bytes .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 110 files changed, 4225 insertions(+), 548 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.