This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit e228463a410b92b472319458c1ad8bf77db3be17 Merge: 517e6bc 7b4b579 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 25 11:39:33 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-5' into 'master' pom.xml | 10 +- tutti-caliper/LICENSE.txt | 674 +++++++++ tutti-caliper/README.md | 0 {tutti-ui-swing-updater => tutti-caliper}/pom.xml | 80 +- .../caliper/feed/CaliperConnectionException.java | 15 +- .../tutti/caliper/feed/CaliperFeedReader.java | 206 +++ .../caliper/feed/event/CaliperFeedReaderEvent.java | 24 +- .../feed/event/CaliperFeedReaderListener.java | 14 +- .../record/CaliperFeedReaderMeasureRecord.java | 19 +- .../record/CaliperFeedReaderRecordFactory.java | 42 +- .../record/CaliperFeedReaderRecordSupport.java | 13 +- tutti-ichtyometer/pom.xml | 2 +- ...{FeedReader.java => IchtyometerFeedReader.java} | 46 +- ...rEvent.java => IchtyometerFeedReaderEvent.java} | 16 +- ...ner.java => IchtyometerFeedReaderListener.java} | 4 +- ...ava => IchtyometerFeedReaderMeasureRecord.java} | 4 +- ...ava => IchtyometerFeedReaderRecordFactory.java} | 26 +- ...ava => IchtyometerFeedReaderRecordSupport.java} | 4 +- ...> IchtyometerFeedReaderStylusMotionRecord.java} | 4 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 8 +- ...derTest.java => IchtyometerFeedReaderTest.java} | 10 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 28 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 31 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 192 +++ .../entities/data/FishingOperationBean.java | 14 +- .../entities/referential/TaxonCache.java | 3 + .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 15 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 14 +- .../src/main/java/fr/ifremer/tutti/util/Units.java | 20 +- .../i18n/tutti-persistence_en_GB.properties | 11 + .../i18n/tutti-persistence_fr_FR.properties | 16 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 141 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 224 ++- .../catches/multipost/MultiPostImportService.java | 20 +- .../ifremer/tutti/service/cruise/CruiseCache.java | 167 +++ .../tutti/service/cruise/CruiseCacheAble.java | 70 + .../tutti/service/cruise/CruiseCacheLoader.java | 151 ++ .../cps/CalcifiedPiecesSamplingExportService.java | 39 +- ...esSamplingAlgorithmEntryNotFoundException.java} | 18 +- .../service/sampling/CruiseSamplingCache.java | 985 ++++++------- .../sampling/CruiseSamplingCacheLoader.java | 156 --- .../sampling/CruiseSamplingInternalCache.java | 223 ++- .../IndividualObservationSamplingCacheRequest.java | 128 ++ .../IndividualObservationSamplingContext.java | 172 +++ .../IndividualObservationSamplingStatus.java | 216 +++ ...ObservationSamplingStatusExceptionSupport.java} | 27 +- .../tutti/service/sampling/SamplingCodeCache.java | 138 ++ .../tutti/service/sampling/SamplingEvent.java | 105 -- ...otDefinedOnIndividualObservationException.java} | 18 +- ...ZoneNotDefinedOnFishingOperationException.java} | 18 +- .../resources/i18n/tutti-service_en_GB.properties | 127 -- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 7 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 54 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 3 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 30 + .../tutti/ui/swing/content/MainUIHandler.java | 31 +- .../content/actions/ConnectCaliperAction.java | 74 + .../content/actions/ConnectIchtyometerAction.java | 6 +- ...terAction.java => DisconnectCaliperAction.java} | 22 +- .../actions/DisconnectIchtyometerAction.java | 4 +- .../content/actions/EditCatchesSupportAction.java | 66 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +- .../content/cruise/actions/SaveCruiseAction.java | 7 +- .../CalcifiedPiecesSamplingReportAction.java | 30 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../SamplingCodeCellEditor.java | 40 +- .../catches/species/BenthosBatchUISupportImpl.java | 10 + .../species/EditSpeciesBatchPanelUIHandler.java | 19 +- .../catches/species/SpeciesBatchUISupportImpl.java | 9 + .../species/SpeciesOrBenthosBatchUISupport.java | 3 + .../create/CreateSpeciesBatchUIHandler.java | 2 + .../catches/species/edit/SpeciesBatchRowModel.java | 2 +- .../species/edit/SpeciesBatchUIHandler.java | 3 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 22 +- .../edit/actions/RemoveSpeciesBatchAction.java | 14 +- .../edit/actions/RemoveSpeciesSubBatchAction.java | 6 +- .../frequency/AverageWeightsHistogramHandler.java | 180 +++ .../frequency/AverageWeightsHistogramModel.java | 141 ++ .../frequency/FrequenciesHistogramHandler.java | 188 +++ .../frequency/FrequenciesHistogramModel.java | 131 ++ .../IndividualObservationBatchRowModel.java | 53 +- .../IndividualObservationBatchRowState.java | 119 ++ .../IndividualObservationBatchTableHandler.java | 667 +++++++++ .../IndividualObservationBatchTableModel.java | 174 ++- .../IndividualObservationBatchUIModel.java | 301 ++++ .../IndividualObservationToFrequencyEngine.java | 260 ++++ ...IndividualObservationToSamplingCacheEngine.java | 143 ++ .../frequency/IndividualObservationUICache.java | 493 ++----- .../species/frequency/SamplingCodeUICache.java | 254 ++++ .../frequency/SamplingNotificationZoneHandler.java | 447 ++++++ .../frequency/SamplingNotificationZoneModel.java | 71 + .../frequency/SamplingNotificationZoneStatus.java | 26 +- .../frequency/SpeciesFrequencyCellComponent.java | 12 +- .../frequency/SpeciesFrequencyLogRowModel.java | 1 - .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyTableModel.java | 518 ++++--- .../species/frequency/SpeciesFrequencyUI.jaxx | 8 +- .../species/frequency/SpeciesFrequencyUI.jcss | 4 - .../frequency/SpeciesFrequencyUIHandler.java | 1450 ++++++-------------- .../species/frequency/SpeciesFrequencyUIModel.java | 639 +++------ .../actions/ApplySpeciesFrequencyRafaleAction.java | 81 +- .../actions/CancelEditSpeciesFrequencyAction.java | 18 +- .../frequency/actions/DeleteSampleCodeAction.java | 4 +- .../DeleteSpeciesFrequencyLogRowAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 71 +- .../GenerateSpeciesFrequencyLengthStepsAction.java | 59 +- .../ImportMultiPostSpeciesSupportAction.java | 96 +- .../frequency/actions/RemoveObservationAction.java | 26 +- .../actions/ResetSpeciesFrequencyAction.java | 13 +- .../species/split/SplitSpeciesBatchUIHandler.java | 2 + .../actions/SaveFishingOperationAction.java | 102 +- .../content/protocol/EditProtocolUIModel.java | 4 +- .../protocol/actions/SaveProtocolAction.java | 6 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../util/table/AbstractTuttiTableUIModel.java | 14 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 59 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 49 +- .../main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 19 +- 130 files changed, 8035 insertions(+), 4170 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.