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 70ee3967c6919053646817e3a9b5e071bc9f6e4d Merge: bc41c04 1997223 Author: Maven Release <maven-release@codelutin.com> Date: Thu Dec 11 16:11:48 2014 +0000 Merge branch 'release/3.10' pom.xml | 2 +- .../AllegroCampagne-Specifications.odt | Bin 776831 -> 766872 bytes .../AllegroCampagne-Specifications.pdf | Bin 1400148 -> 1420873 bytes tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 26 +- ....java => RemoteDeviceCantGetNameException.java} | 36 +- .../ifremer/tutti/ichtyometer/feed/FeedReader.java | 50 ++- .../tutti/ichtyometer/feed/FeedReaderRecord.java | 166 -------- .../feed/{ => event}/FeedReaderEvent.java | 11 +- .../feed/{ => event}/FeedReaderListener.java | 2 +- .../feed/record/FeedReaderMeasureRecord.java | 81 ++++ .../feed/record/FeedReaderRecordFactory.java | 96 +++++ .../FeedReaderRecordSupport.java} | 44 +- .../feed/record/FeedReaderStylusMotionRecord.java | 81 ++++ .../tutti/ichtyometer/interactive/Command.java | 10 +- .../ichtyometer/interactive/CommandEngine.java | 16 +- .../tutti/ichtyometer/tool/CRCBuilderTool.java | 58 --- .../tutti/ichtyometer/tool/FeedReaderTool.java | 6 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 4 +- .../{IchtyometerClientTest.java => BigFins.java} | 41 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 17 +- .../ichtyometer/feed/FeedReaderRecordTest.java | 64 --- .../tutti/ichtyometer/feed/FeedReaderTest.java | 20 +- .../ichtyometer/interactive/CommandEngineTest.java | 80 ++-- .../src/test/resources/log4j.properties | 2 +- tutti-persistence/pom.xml | 2 +- .../entities}/protocol/CaracteristicType.java | 16 +- .../entities/protocol/TuttiProtocols.java | 180 ++++++-- .../entities/protocol/v2/TuttiProtocol2.java | 204 +++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 466 ++++++++++++++++++++ .../service/ProtocolPersistenceServiceImpl.java | 3 +- .../i18n/tutti-persistence_en_GB.properties | 4 + .../src/main/xmi/tutti-persistence.properties | 3 +- .../src/main/xmi/tutti-persistence.zargo | Bin 56767 -> 57983 bytes ...-persistence.zargo => tutti-persistence.zargo~} | Bin 56767 -> 57983 bytes .../entities/protocol/TuttiProtocolsTest.java | 45 +- .../ProtocolPersistenceServiceReadTest.java | 11 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 11 + .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 70 +++ .../service/export/generic/CatchExportModel.java | 15 +- .../FishingOperationImportService.java | 191 +++++++++ ...lumnFileFishingOperationNotFoundException.java} | 24 +- .../ImportFromColumnFileInvalidRowException.java | 53 +++ ...ImportFromColumnFileMissingHeaderException.java | 38 +- .../operationimport/ImportFromColumnFileModel.java | 234 ++++++++++ .../tutti/service/protocol/CaracteristicRow.java | 1 + .../service/protocol/CaracteristicRowModel.java | 2 +- .../protocol/ProtocolImportExportService.java | 58 ++- .../resources/i18n/tutti-service_en_GB.properties | 8 + .../resources/i18n/tutti-service_fr_FR.properties | 5 + .../protocol/ProtocolImportExportServiceTest.java | 35 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 8 +- tutti-ui-swing/src/main/help/en/config.html | 13 +- tutti-ui-swing/src/main/help/fr/config.html | 10 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../action/AddCaracteristicMappingAction.java | 94 ++++ ...perationCaracteristicsFromColumnFileAction.java | 152 +++++++ .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../action/LoadProtocolImportColumnsAction.java | 86 ++++ .../action/RemoveCaracteristicMappingAction.java | 129 ++++++ .../tutti/ui/swing/action/SaveProtocolAction.java | 29 ++ .../content/operation/EditFishingOperationUI.css | 10 + .../content/operation/EditFishingOperationUI.jaxx | 1 + .../operation/EditFishingOperationUIHandler.java | 18 + .../operation/EditFishingOperationUIModel.java | 13 + .../frequency/BenthosFrequencyUIHandler.java | 67 ++- .../benthos/frequency/BenthosFrequencyUIModel.java | 44 ++ .../frequency/SpeciesFrequencyUIHandler.java | 99 ++++- .../species/frequency/SpeciesFrequencyUIModel.java | 44 ++ .../fishing/AbstractCaracteristicTabUIHandler.java | 26 +- .../fishing/GearUseFeatureTabUIHandler.java | 10 +- .../fishing/VesselUseFeatureTabUIHandler.java | 10 +- .../EditProtocolCaracteristicsRowModel.java | 118 ++++++ .../EditProtocolCaracteristicsTableModel.java | 69 +++ .../EditProtocolOperationFieldsRowModel.java | 81 ++++ .../EditProtocolOperationFieldsTableModel.java | 58 +++ .../ui/swing/content/protocol/EditProtocolUI.css | 63 ++- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 46 +- .../content/protocol/EditProtocolUIHandler.java | 472 ++++++++++++++++----- .../content/protocol/EditProtocolUIModel.java | 353 +++++++++++---- .../ui/swing/util/TuttiNumberTickUnitSource.java | 229 ++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 36 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 39 +- 86 files changed, 4200 insertions(+), 834 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.