This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from 32d5576 [maven-release-plugin] copy for tag tutti-3.5 adds 2d6d688 [maven-release-plugin] prepare for next development iteration adds 4a86eb5 fixes #5172: [TECH] Configurer la source des mises à jours de l'application en adéquation avec le type de version adds d17449b fixes #5173 adds 8df9a66 migrate to git adds 63b38ee refs #5335 prepare all ui adds 98ff5b4 refs #5335 implements services + fix uis adds 618e58b refs #5335 add validators files + use an edit validation context anywhere adds fc13712 refs #5335 use new validators in ui validate action + fix i18n adds d47ad33 refs #5335 add validation of cruise adds 923287d refs #5335 add refresh button on editCruise and editProgram + finish feature adds e8678d1 Merge branch 'feature/5335' into develop fixes #5335 [REFERENTIELS] Remplacement des référentiels temporaires adds 032ae88 refs #5474 fix test + migrates to codelutinpom adds 9926871 refs #5474 update site configuration adds 2250baa refs #5474 using none central dependencies adds 7979070 refs #5474 update site configuration adds 0ffad8a refs #5474 using none central dependencies (fix profile activation) adds ed4c8d6 Merge branch 'feature/5474' into develop fixes #5474 adds 2b97140 refs #5474 make jar executable + update some docs adds d84af15 refs #5474 use codelutinpom 1.1 adds 9e4538c use last jre available 1.7u65 adds 3bb3cb4 improve .gitignore adds 78e6342 fix Léo email adds 2dd7f2a amelioration doc de release adds 7c08015 amelioration doc de release adds b9e54a8 [jgitflow-maven-plugin]updating poms for branch '3.6' with snapshot versions adds d1f04a9 [jgitflow-maven-plugin]updating poms for branch'release/3.6' with non-snapshot versions adds f75075e add license headers adds 2d5093f Merge branch 'release/3.6' No new revisions were added by this update. Summary of changes: .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 | 19 +- ....xml => BenthosBatch-edit-error-validation.xml} | 0 .../BenthosBatch-validate-fatal-validation.xml | 19 +- ...dation.xml => Cruise-edit-error-validation.xml} | 0 ...on.xml => Cruise-validate-error-validation.xml} | 9 +- .../Cruise-validate-fatal-validation.xml} | 36 +- .../FishingOperation-validate-fatal-validation.xml | 25 ++ ...dualObservationBatch-edit-error-validation.xml} | 8 +- ...lObservationBatch-validate-fatal-validation.xml | 19 +- ...=> 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 | 19 +- .../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 | 37 +- .../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} | 15 +- .../replace/ReplaceTemporaryGearUI.jaxx} | 37 +- .../ReplaceTemporaryGearUIHandler.java} | 55 +-- .../replace/ReplaceTemporaryGearUIModel.java} | 20 +- .../replace/ReplaceTemporaryPersonUI.css} | 17 +- .../replace/ReplaceTemporaryPersonUI.jaxx} | 32 +- .../ReplaceTemporaryPersonUIHandler.java} | 55 +-- .../replace/ReplaceTemporaryPersonUIModel.java} | 20 +- .../replace/ReplaceTemporarySpeciesUI.css} | 15 +- .../replace/ReplaceTemporarySpeciesUI.jaxx} | 37 +- .../ReplaceTemporarySpeciesUIHandler.java} | 55 +-- .../replace/ReplaceTemporarySpeciesUIModel.java} | 24 +- .../replace/ReplaceTemporaryVesselUI.css} | 15 +- .../replace/ReplaceTemporaryVesselUI.jaxx} | 37 +- .../ReplaceTemporaryVesselUIHandler.java} | 55 +-- .../replace/ReplaceTemporaryVesselUIModel.java} | 20 +- ... EditCruiseUIModel-edit-warning-validation.xml} | 0 ...ctReplaceTemporaryUIModel-error-validation.xml} | 22 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 87 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 46 +++ ...vessel.png => action-observed_fishing_trip.png} | Bin 3202 -> 3348 bytes .../{action-generate.png => action-replace.png} | Bin .../tutti/ui/swing/BeanValidatorDetectorTest.java | 2 +- 110 files changed, 3836 insertions(+), 655 deletions(-) create mode 100644 .gitignore create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/validator/TemporaryReferentialFieldValidator.java rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{AccidentalBatch-error-validation.xml => AccidentalBatch-edit-error-validation.xml} (93%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml => tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/AccidentalBatch-validate-fatal-validation.xml (77%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{BenthosBatch-error-validation.xml => BenthosBatch-edit-error-validation.xml} (100%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml => tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/BenthosBatch-validate-fatal-validation.xml (77%) copy tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{Cruise-error-validation.xml => Cruise-edit-error-validation.xml} (100%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{Cruise-error-validation.xml => Cruise-validate-error-validation.xml} (97%) copy tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/{protocol/TuttiProtocol-error-validation.xml => data/Cruise-validate-fatal-validation.xml} (54%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{IndividualObservationBatch-error-validation.xml => IndividualObservationBatch-edit-error-validation.xml} (83%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml => tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/IndividualObservationBatch-validate-fatal-validation.xml (77%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{MarineLitterBatch-error-validation.xml => MarineLitterBatch-edit-error-validation.xml} (100%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{Program-error-validation.xml => Program-edit-error-validation.xml} (100%) rename tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/{SpeciesBatch-error-validation.xml => SpeciesBatch-edit-error-validation.xml} (100%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIModel-error-validation.xml => tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/SpeciesBatch-validate-fatal-validation.xml (77%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractOpenReplaceTemporaryUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{EditCruiseFishingOperationAction.java => EditFishingOperationInValidationUIAction.java} (96%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryGearUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryPersonUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporarySpeciesUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenReplaceTemporaryVesselUIAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryGearAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryPersonAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporarySpeciesAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReplaceTemporaryVesselAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ResetCruiseAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ResetProgramAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/CruiseTreeNode.java copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java => tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/MessageTreeNode.java (52%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/OperationTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/tree/ValidationTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUIModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.css => content/referential/replace/ReplaceTemporaryGearUI.css} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/computable/ComputableDataEditor.jaxx => content/referential/replace/ReplaceTemporaryGearUI.jaxx} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUIHandler.java => replace/ReplaceTemporaryGearUIHandler.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{cruise/GearCaracteristicsEditorRowModel.java => referential/replace/ReplaceTemporaryGearUIModel.java} (65%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.css => content/referential/replace/ReplaceTemporaryPersonUI.css} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{config/TuttiConfigUI.jaxx => referential/replace/ReplaceTemporaryPersonUI.jaxx} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUIHandler.java => replace/ReplaceTemporaryPersonUIHandler.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/caracteristics/CaracteristicMapEditorRowModel.java => content/referential/replace/ReplaceTemporaryPersonUIModel.java} (65%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.css => content/referential/replace/ReplaceTemporarySpeciesUI.css} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/computable/ComputableDataEditor.jaxx => content/referential/replace/ReplaceTemporarySpeciesUI.jaxx} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUIHandler.java => replace/ReplaceTemporarySpeciesUIHandler.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/caracteristics/CaracteristicMapColumnUIHandler.java => content/referential/replace/ReplaceTemporarySpeciesUIModel.java} (66%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/comment/CommentEditorUI.css => content/referential/replace/ReplaceTemporaryVesselUI.css} (71%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/computable/ComputableDataEditor.jaxx => content/referential/replace/ReplaceTemporaryVesselUI.jaxx} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/{ManageTemporaryReferentialUIHandler.java => replace/ReplaceTemporaryVesselUIHandler.java} (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/caracteristics/CaracteristicMapEditorRowModel.java => content/referential/replace/ReplaceTemporaryVesselUIModel.java} (65%) rename tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/cruise/{EditCruiseUIModel-warning-validation.xml => EditCruiseUIModel-edit-warning-validation.xml} (100%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{home/SelectCruiseUIModel-error-validation.xml => referential/replace/AbstractReplaceTemporaryUIModel-error-validation.xml} (69%) copy tutti-ui-swing/src/main/resources/icons/{action-vessel.png => action-observed_fishing_trip.png} (78%) copy tutti-ui-swing/src/main/resources/icons/{action-generate.png => action-replace.png} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.