December 2014 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (ddad190 -> 3326561)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ddad190 fix test new de888bd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f4cda29 prepare release 3.10 new 1997223 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions new 70ee396 Merge branch 'release/3.10' new 372ce65 Merge branch 'master' into develop new 3326561 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3326561e3aa0846e952b38bd2eb6bc94920c0303 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:11:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 372ce65eaa074e45f24898214cbcc4e7ea6cf2f1 Merge: de888bd 70ee396 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 Merge branch 'master' into develop commit de888bdda6015d889e6dc291a1569c842c89ac76 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:11:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 70ee3967c6919053646817e3a9b5e071bc9f6e4d Merge: bc41c04 1997223 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:11:48 2014 +0000 Merge branch 'release/3.10' commit 1997223fe5502c35995aa88acd183c5b17cd6e39 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:07:52 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.10' with non-snapshot versions commit f4cda2962eff51f3758728c781ee95222788a184 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 16:06:41 2014 +0000 prepare release 3.10 Summary of changes: .../RemoteDeviceCantGetNameException.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderMeasureRecord.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordFactory.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderRecordSupport.java | 24 ++++++++++++++++++++++ .../feed/record/FeedReaderStylusMotionRecord.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocol2.java | 24 ++++++++++++++++++++++ .../entities/protocol/v2/TuttiProtocolBean2.java | 24 ++++++++++++++++++++++ .../FishingOperationImportService.java | 24 ++++++++++++++++++++++ ...olumnFileFishingOperationNotFoundException.java | 24 ++++++++++++++++++++++ .../ImportFromColumnFileInvalidRowException.java | 24 ++++++++++++++++++++++ ...ImportFromColumnFileMissingHeaderException.java | 24 ++++++++++++++++++++++ .../operationimport/ImportFromColumnFileModel.java | 24 ++++++++++++++++++++++ ...perationCaracteristicsFromColumnFileAction.java | 24 ++++++++++++++++++++++ .../action/LoadProtocolImportColumnsAction.java | 24 ++++++++++++++++++++++ .../action/RemoveCaracteristicMappingAction.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolCaracteristicsTableModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsRowModel.java | 24 ++++++++++++++++++++++ .../EditProtocolOperationFieldsTableModel.java | 24 ++++++++++++++++++++++ .../ui/swing/util/TuttiNumberTickUnitSource.java | 24 ++++++++++++++++++++++ 21 files changed, 504 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch master updated (bc41c04 -> 70ee396)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

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(a)codelutin.com>.

1 0

[ANN] - Tutti 3.10 released
by codelutin.com Release Notification Dec. 11, 2014

Dec. 11, 2014

The Tutti team is pleased to announce the tutti-3.10 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait Issue: 6129. Thanks to Kevin Morin. Resolved by kmorin. o [BIGFIN] Pouvoir lire les mesures depuis le DFS2 (new BigFin) Issue: 6157. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [IMPORT PUPITRI] Erreur à l'import des fichiers .car et .tnk Issue: 6185. Thanks to Anne-Sophie Cornou. Resolved by tchemit. o [CAPTURE] erreur sur écran mensuration 3.7.8 Issue: 6124. Thanks to Vincent BADTS. Resolved by kmorin. o [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 Issue: 6094. Thanks to Vincent BADTS. Resolved by kmorin. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.10-tools.zip - http://forge.codelutin.com/attachments/download/2615 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch develop updated (60987ff -> ddad190)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 60987ff [jgitflow-maven-plugin]updating poms for 3.11-SNAPSHOT development new ddad190 fix test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ddad190895aac2cedef2125ad412427a1774d26a Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 16:54:09 2014 +0100 fix test Summary of changes: .../entities/protocol/TuttiProtocolsTest.java | 27 ++++++++++++++-------- .../ProtocolPersistenceServiceReadTest.java | 2 +- .../protocol/ProtocolImportExportServiceTest.java | 27 ++++++++++++++-------- 3 files changed, 37 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/3.10 created (now 7c138f2)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch release/3.10 in repository tutti. See http://git.codelutin.com/tutti.git at 7c138f2 remove fixme No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (7c138f2 -> 60987ff)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 7c138f2 remove fixme new 60987ff [jgitflow-maven-plugin]updating poms for 3.11-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 60987ff71ada126482279cbca0ecd002b2e36387 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Dec 11 15:23:51 2014 +0000 [jgitflow-maven-plugin]updating poms for 3.11-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (1f718cb -> 7c138f2)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 1f718cb fixes #6157 Merge branch 'feature/6157' into develop new 2db3d09 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait new 3bbb702 refs #6129 new b1b82c0 refs #5954 add v2 version new 9c6de72 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait new b0cdc86 refs #6129 import du fichier avec les colonnes new b046594 refs #6129 mapping des champs du trait avec les colonnes + début import dans le trait new 4085ac3 refactoring : table des caractéristiques non éditable, ajouter les caractéristiques depuis la liste déroulante au dessus new 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) new 4b7efb2 correction de la suppression new 490685c import new 65484e6 empecher de saisir plusieurs fois la même colonne dans les caracteristiques new b3ac98d add todo new 34b8502 - error management - check the operation key to enable or not the import - import locations new 8cb32da fix import of lists new a899157 ajout javadoc + nettoyage imports new 45aacd5 ajout service d'import des caractéristicques d'un trait new 51e78a2 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié new e62c69c utilisation d'une exception si colonne non trouvee dans le header new 97b6318 fix imports new d5d1292 refs #6129 fix export new 7c138f2 remove fixme The 21 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7c138f2df004a99203c4c69467f7cfceffdbba08 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 16:15:49 2014 +0100 remove fixme commit d5d12920c295169afe48f8b856c0c207f6425e94 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 16:14:39 2014 +0100 refs #6129 fix export commit 97b6318484b7899d9d97ac5525896ccefb915367 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 16:01:05 2014 +0100 fix imports commit e62c69c78d2b2f1a46220eebec34a75b64bcb9d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:58:19 2014 +0100 utilisation d'une exception si colonne non trouvee dans le header commit 51e78a270fc20df29a75fd8a7f2a52c026b9661a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:50:44 2014 +0100 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié commit 45aacd562efa18241aba5280b93d851112a67dbb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:50:11 2014 +0100 ajout service d'import des caractéristicques d'un trait commit a899157b71c88fedf2bce5904e4b69beb03c7e71 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:49:30 2014 +0100 ajout javadoc + nettoyage imports commit 8cb32da105caf5bc9ff8117404e4e1995ae6b536 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 12:09:26 2014 +0100 fix import of lists commit 34b8502bf937aab63b64aa6951cb757d6fa72607 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 11:10:25 2014 +0100 - error management - check the operation key to enable or not the import - import locations commit b3ac98d4023cbe64baa8f4ae47d7cbed9b141d55 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 10 09:30:38 2014 +0100 add todo commit 65484e68b6aaf38f8b8039a26cf878aab06528cd Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Dec 10 09:22:20 2014 +0100 empecher de saisir plusieurs fois la même colonne dans les caracteristiques commit 490685cf85e9b1e2989419a82b7926153bc5df67 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 9 18:23:03 2014 +0100 import commit 4b7efb2105e9a90667277c15ad8e2d5fc904fddc Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 9 12:21:12 2014 +0100 correction de la suppression commit c2893a748ac4ed780cab491239b0800aef5d8819 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 9 10:28:40 2014 +0100 - 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) commit 4085ac33909c11155d147699cab8ff455aad835f Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Dec 8 17:38:25 2014 +0100 refactoring : table des caractéristiques non éditable, ajouter les caractéristiques depuis la liste déroulante au dessus commit b0465940ceaa9e704ca6462d9a4d2ae4343eeda8 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Dec 2 19:09:14 2014 +0100 refs #6129 mapping des champs du trait avec les colonnes + début import dans le trait commit b0cdc86ec757be55502b2422fefcbfc8c34ecfc6 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Dec 1 14:47:06 2014 +0100 refs #6129 import du fichier avec les colonnes commit 9c6de7275dba89759d4f814c2fa9fea4f6fc8a64 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 27 16:37:05 2014 +0100 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait commit b1b82c0687e79fb76051b09a9a849041c0515ca4 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 14:31:13 2014 +0100 refs #5954 add v2 version commit 3bbb702c9e1b55dff5f74a12d66491d012d72b78 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 11:05:10 2014 +0100 refs #6129 commit 2db3d09d159bf8f477aafd093425c307c0bf1387 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 20 11:12:18 2014 +0100 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait Summary of changes: .../entities}/protocol/CaracteristicType.java | 16 +- .../entities/protocol/TuttiProtocols.java | 180 ++++++-- .../TuttiProtocol1.java => v2/TuttiProtocol2.java} | 101 +++-- .../TuttiProtocolBean2.java} | 194 ++++++--- .../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 | 18 +- .../ProtocolPersistenceServiceReadTest.java | 11 +- .../fr/ifremer/tutti/service/DecoratorService.java | 11 + .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 70 +++ .../FishingOperationImportService.java | 167 ++++++++ ...olumnFileFishingOperationNotFoundException.java | 15 + .../ImportFromColumnFileInvalidRowException.java | 29 ++ ...ImportFromColumnFileMissingHeaderException.java | 24 ++ .../operationimport/ImportFromColumnFileModel.java | 210 +++++++++ .../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 +- .../filtered-resources/tutti-help-fr.properties | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + ...ion.java => AddCaracteristicMappingAction.java} | 49 +-- ...perationCaracteristicsFromColumnFileAction.java | 128 ++++++ .../swing/action/ImportProtocolBenthosAction.java | 2 +- .../swing/action/ImportProtocolSpeciesAction.java | 2 +- .../action/LoadProtocolImportColumnsAction.java | 62 +++ .../action/RemoveCaracteristicMappingAction.java | 105 +++++ .../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 + .../fishing/AbstractCaracteristicTabUIHandler.java | 26 +- .../fishing/GearUseFeatureTabUIHandler.java | 10 +- .../fishing/VesselUseFeatureTabUIHandler.java | 10 +- .../EditProtocolCaracteristicsRowModel.java | 94 ++++ .../EditProtocolCaracteristicsTableModel.java | 45 ++ .../EditProtocolOperationFieldsRowModel.java | 57 +++ .../EditProtocolOperationFieldsTableModel.java | 34 ++ .../ui/swing/content/protocol/EditProtocolUI.css | 63 ++- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 46 +- .../content/protocol/EditProtocolUIHandler.java | 472 ++++++++++++++++----- .../content/protocol/EditProtocolUIModel.java | 353 +++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 36 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 39 +- 50 files changed, 2439 insertions(+), 443 deletions(-) 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} (57%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{v1/TuttiProtocolBean1.java => v2/TuttiProtocolBean2.java} (59%) 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 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 21

branch feature/5954 updated (f3570e7 -> 3347a47)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git from f3570e7 utilisation d'une exception si colonne non trouvee dans le header new 3347a47 fix imports The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3347a47dc99a99fd069dedb4998930fe7d24cc5d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 16:01:05 2014 +0100 fix imports Summary of changes: .../protocol/ProtocolImportExportService.java | 58 ++++++++++----- ...perationCaracteristicsFromColumnFileAction.java | 86 +++++++++------------- 2 files changed, 75 insertions(+), 69 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/5954 updated (e42f4dd -> f3570e7)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git from e42f4dd fix import of lists new 21ce8ea ajout javadoc + nettoyage imports new 8011271 ajout service d'import des caractéristicques d'un trait new 4bfd259 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié new f3570e7 utilisation d'une exception si colonne non trouvee dans le header The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f3570e7999496d1da30a99852283fcded556c25d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:58:19 2014 +0100 utilisation d'une exception si colonne non trouvee dans le header commit 4bfd2593e8b7ad33ddb43025d311485c631a0a93 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:50:44 2014 +0100 renommage de l'action d'import de caracteristiques d'un trait + utilisation du service dédié commit 80112711ac70a6b2416433c3ca73367cd79aa753 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:50:11 2014 +0100 ajout service d'import des caractéristicques d'un trait commit 21ce8ea10e64f90d222976c35b2a74fb6b9ad4c3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 11 13:49:30 2014 +0100 ajout javadoc + nettoyage imports Summary of changes: .../entities/protocol/v2/TuttiProtocol2.java | 4 + .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../FishingOperationImportService.java | 167 ++++++++++ ...olumnFileFishingOperationNotFoundException.java | 15 + .../ImportFromColumnFileInvalidRowException.java | 29 ++ ...ImportFromColumnFileMissingHeaderException.java | 24 ++ .../operationimport/ImportFromColumnFileModel.java | 210 ++++++++++++ .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + ...perationCaracteristicsFromColumnFileAction.java | 142 ++++++++ .../swing/action/ImportFromColumnFileAction.java | 367 --------------------- .../content/operation/EditFishingOperationUI.css | 2 +- 11 files changed, 597 insertions(+), 370 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileFishingOperationNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileInvalidRowException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileMissingHeaderException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFishingOperationCaracteristicsFromColumnFileAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportFromColumnFileAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch feature/5954 updated (f2c5c8d -> e42f4dd)
by codelutin.com scm Dec. 11, 2014

Dec. 11, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git from f2c5c8d - error management - check the operation key to enable or not the import - import locations new e42f4dd fix import of lists The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e42f4ddba67331cf2fed27945e734fe6f01770a2 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Dec 11 12:09:26 2014 +0100 fix import of lists Summary of changes: .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 70 ++++++++++++++++++++++ .../swing/action/ImportFromColumnFileAction.java | 40 +++++++++---- .../operation/EditFishingOperationUIModel.java | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 4 files changed, 104 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1