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 f48e78614088a02f1bb9d8cbd286be38015e172a Merge: 70ee396 8c3c79c Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 2 15:07:10 2015 +0000 Merge branch 'release/3.11' pom.xml | 10 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../entities/data/FishingOperations.java | 37 ++ .../FishingOperationPersistenceServiceImpl.java | 4 +- .../tutti/persistence/test/DatabaseFixtures.java | 2 +- .../src/main/xmi/tutti-persistence.zargo | Bin 57983 -> 57987 bytes .../src/main/xmi/tutti-persistence.zargo~ | Bin 57983 -> 0 bytes ...ishingOperationPersistenceServiceWriteTest.java | 2 +- .../ProtocolPersistenceServiceReadTest.java | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 24 + .../export/generic/OperationExportModel.java | 2 +- .../service/export/generic/OperationExportRow.java | 2 +- .../operationimport/ImportFromColumnFileModel.java | 81 ++- .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../multipost/MultiPostImportServiceTest.java | 3 + .../export/generic/TuttiExportServiceTest.java | 8 +- .../protocol/ProtocolImportExportServiceTest.java | 30 +- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 7 +- .../src/test/resources/pupitri/ano-3898.car | 8 +- .../test/resources/pupitri/ano-5079.tuttiProtocol | 1 + tutti-ui-swing/pom.xml | 14 +- .../tutti/ui/swing/action/ShowAboutAction.java | 3 +- .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 4 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/operation/EditFishingOperationUI.css | 60 +- .../content/operation/EditFishingOperationUI.jaxx | 22 +- .../operation/EditFishingOperationUIHandler.java | 4 +- .../operation/EditFishingOperationUIModel.java | 6 +- .../content/operation/catches/EditCatchesUI.css | 14 +- .../operation/catches/SampleCategoryComponent.java | 16 +- .../accidental/create/CreateAccidentalBatchUI.css | 11 +- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 10 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../benthos/create/CreateBenthosBatchUI.css | 11 +- .../benthos/create/CreateBenthosBatchUI.jaxx | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 10 +- .../BenthosFrequencyLogCellComponent.java | 82 ++- .../frequency/BenthosFrequencyLogRowModel.java | 3 + .../frequency/BenthosFrequencyRowModel.java | 2 +- .../frequency/BenthosFrequencyTableModel.java | 264 ++++++-- .../benthos/frequency/BenthosFrequencyUI.css | 82 +-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 205 +++---- .../frequency/BenthosFrequencyUIHandler.java | 644 +++++--------------- .../benthos/frequency/BenthosFrequencyUIModel.java | 252 +++++--- .../frequency/BenthosFrequencyUIModelCache.java | 157 +++++ ...thosFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplyBenthosFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditBenthosFrequencyAction.java | 73 +++ .../DeleteBenthosFrequencyLogRowAction.java | 98 +++ .../GenerateBenthosFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetBenthosFrequencyAction.java | 67 ++ .../SaveAndCloseBenthosFrequencyAction.java | 79 +++ .../SaveAndContinueBenthosFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../IndividualObservationBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.css | 6 +- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +- .../catches/marinelitter/MarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.css | 6 +- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 10 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 13 +- .../species/create/CreateSpeciesBatchUI.jaxx | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 10 +- .../SpeciesFrequencyLogCellComponent.java | 86 ++- .../frequency/SpeciesFrequencyLogRowModel.java | 5 +- .../frequency/SpeciesFrequencyLogsTableModel.java | 7 - .../frequency/SpeciesFrequencyTableModel.java | 249 ++++++-- .../species/frequency/SpeciesFrequencyUI.css | 83 +-- .../species/frequency/SpeciesFrequencyUI.jaxx | 94 ++- .../frequency/SpeciesFrequencyUIHandler.java | 676 +++++---------------- .../species/frequency/SpeciesFrequencyUIModel.java | 251 +++++--- .../frequency/SpeciesFrequencyUIModelCache.java | 158 +++++ ...ciesFrequencyLengthStepCaracteristicAction.java | 99 +++ .../actions/ApplySpeciesFrequencyRafaleAction.java | 130 ++++ .../actions/CancelEditSpeciesFrequencyAction.java | 73 +++ .../DeleteSpeciesFrequencyLogRowAction.java | 99 +++ .../GenerateSpeciesFrequencyLengthStepsAction.java | 102 ++++ .../actions/ResetSpeciesFrequencyAction.java | 67 ++ .../SaveAndCloseSpeciesFrequencyAction.java | 79 +++ .../SaveAndContinueSpeciesFrequencyAction.java | 73 +++ .../frequency/actions/SaveSupportAction.java | 129 ++++ .../content/protocol/EditProtocolUIHandler.java | 13 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 25 +- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 8 + .../util/computable/ComputableDataEditor.jaxx | 13 +- .../computable/ComputableDataEditorHandler.java | 52 +- .../util/computable/ComputableDataTableCell.java | 19 +- .../ui/swing/util/species/EnterMelagWeightUI.css | 3 +- .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 5 +- .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 10 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 22 +- .../src/main/resources/icons/allegro_16.png | Bin 0 -> 932 bytes .../src/main/resources/icons/allegro_32.png | Bin 1977 -> 2159 bytes .../src/main/resources/icons/allegro_64.png | Bin 0 -> 5953 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 448188 -> 0 bytes 108 files changed, 3818 insertions(+), 1912 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.