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 bc41c04 Merge branch 'release/3.9' adds 1a84902 Mise à jour des spécifications . Version 0.5.1X adds b040e4c [jgitflow-maven-plugin]updating poms for 3.10-SNAPSHOT development adds d0605b8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f2ba60e Merge branch 'master' into develop adds a150129 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds cc2d9e4 fixes #6094 [CAPTURE] adapter le pas de l'axe des x "classe de taille" au pas de la classe de taille. Si 1 aller de 1 en 1, si 0.5 alller de 0.5 en 0.5 adds a8f583b Merge branch 'develop' of https://git.codelutin.com/tutti into develop adds c63afb1 fixes #6124 [CAPTURE] erreur sur écran mensuration 3.7.8 adds 82f4eda changement du nom du device adds 83eb615 refs #6174 (ajout d'une exception si le poids est null (et aussi le poids calcule)) adds c1b24dc fixes #6157: [BIGFIN] modifier le code pour s'adapter au DFS2 (new BigFin) adds 1f718cb fixes #6157 Merge branch 'feature/6157' into develop adds 2db3d09 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait adds 3bbb702 refs #6129 adds b1b82c0 refs #5954 add v2 version adds 9c6de72 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait adds b0cdc86 refs #6129 import du fichier avec les colonnes adds b046594 refs #6129 mapping des champs du trait avec les colonnes + début import dans le trait adds 4085ac3 refactoring : table des caractéristiques non éditable, ajouter les caractéristiques depuis la liste déroulante au dessus adds c2893a7 - ne pas proposer les caractéristiques déjà ajoutées dans d'autres onglets - possibilité de supprimer des caractéristiques dans le tableau (clic droit) adds 4b7efb2 correction de la suppression adds 490685c import adds 65484e6 empecher de saisir plusieurs fois la même colonne dans les caracteristiques adds b3ac98d add todo adds 34b8502 - error management - check the operation key to enable or not the import - import locations adds 8cb32da fix import of lists adds a899157 ajout javadoc + nettoyage imports adds 45aacd5 ajout service d'import des caractéristicques d'un trait adds 51e78a2 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié adds e62c69c utilisation d'une exception si colonne non trouvee dans le header adds 97b6318 fix imports adds d5d1292 refs #6129 fix export adds 7c138f2 remove fixme adds f4cda29 prepare release 3.10 adds 1997223 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions adds 70ee396 Merge branch 'release/3.10' No new revisions were added by this update. Summary of changes: 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 +- .../RemoteDeviceCantGetNameException.java | 23 +- .../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 +++++ .../feed/record/FeedReaderRecordSupport.java | 45 +- .../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 ++++++-- .../TuttiProtocol1.java => v2/TuttiProtocol2.java} | 85 ++-- .../TuttiProtocolBean2.java} | 178 ++++++-- .../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 +++++++++ ...olumnFileFishingOperationNotFoundException.java | 16 +- .../ImportFromColumnFileInvalidRowException.java | 30 +- ...ImportFromColumnFileMissingHeaderException.java | 25 +- .../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 + ...ion.java => AddCaracteristicMappingAction.java} | 49 +-- ...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, 3596 insertions(+), 930 deletions(-) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java => tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDeviceCantGetNameException.java (69%) delete mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecord.java rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/{ => event}/FeedReaderEvent.java (76%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/{ => event}/FeedReaderListener.java (95%) create mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java create mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/TuttiMessageNodeSupport.java => tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java (54%) create mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java delete mode 100644 tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/CRCBuilderTool.java copy tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/{IchtyometerClientTest.java => BigFins.java} (60%) delete mode 100644 tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderRecordTest.java rename {tutti-service/src/main/java/fr/ifremer/tutti/service => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities}/protocol/CaracteristicType.java (71%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{v1/TuttiProtocol1.java => v2/TuttiProtocol2.java} (61%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{v1/TuttiProtocolBean1.java => v2/TuttiProtocolBean2.java} (60%) copy tutti-persistence/src/main/xmi/{tutti-persistence.zargo => tutti-persistence.zargo~} (50%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java (75%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java => tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java (55%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java (64%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{AddSpeciesProtocolAction.java => AddCaracteristicMappingAction.java} (54%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolOperationFieldsTableModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.