This is an automated email from the git hooks/post-receive script. New change to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git discards d6df1b4 ajout de la tonalité nulle dans la conf (refs #7063) discards 58ca78e joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) discards 098f8c3 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 7480cb5 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 33751b3 ajout des lots manquants lors de l'import (refs #6116) adds bbe9477 ajout de la conf dans l'ui (fixes #6116) adds 3218e37 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 05f0b86 ajout des lots manquants lors de l'import (refs #6116) adds ce0e1fb ajout de la conf dans l'ui (fixes #6116) adds 25d7a75 ajout de test + création des lots manquants avec des poids nuls (fixes #6116) adds 4a07303 merge with develop adds fa84c0d ne pas mettre les lignes créées dans le rapport (fixes #6116) adds ff4b4dd fix test adds 54e10a1 fix tests adds 72cb7b0 Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). adds 2a51826 Ne pas instancier des inner classes quand cela n'est pas nécessaire adds d782989 fix i18n adds 34b22cc Ajout javadoc + mettre en final ce qui est possible adds ec70ee5 Fixes #6116 Merge branch 'feature/6116' into develop adds 579c5e8 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 8756563 joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) adds e5d5f95 ajout de la tonalité nulle dans la conf (refs #7063) adds d39faf4 ajout de la lecture des nombres mais il reste un problème de lecture de certains nombres (2000 cm par exemple, mais je ne sais pas pourquoi) (refs #7063) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d6df1b4) \ N -- N -- N refs/heads/feature/7063 (d39faf4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 + .../protocol/CaracteristicMappingRows.java | 27 ++ .../entities/protocol/SpeciesProtocols.java | 34 +++ .../entities/protocol/TuttiProtocols.java | 37 +-- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../pupitri/CarrouselImportRequestResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 148 +++++++++-- .../service/pupitri/PupitriSpeciesContext.java | 34 ++- .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 293 +++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6592Test.java | 4 +- .../service/pupitri/PupitriImportServiceTest.java | 2 +- .../src/test/resources/pupitri/evo-6116.car | 7 + .../pupitri/{evo-6592.tnk => evo-6116.tnk} | 0 .../test/resources/pupitri/evo-6116.tuttiProtocol | 198 ++++++++++++++ .../src/main/filtered-resources/log4j.properties | 1 + .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 + .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../catches/species/ImportPupitriPopupUI.css | 9 + .../catches/species/ImportPupitriPopupUI.jaxx | 24 +- .../species/ImportPupitriPopupUIHandler.java | 82 +++--- .../catches/species/ImportPupitriPopupUIModel.java | 54 ++++ .../species/actions/ImportPupitriAction.java | 22 +- .../frequency/SpeciesFrequencyUIHandler.java | 2 - .../actions/ApplySpeciesFrequencyRafaleAction.java | 8 +- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 100 ++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + tutti-ui-swing/src/main/resources/sounds/,.wav | Bin 0 -> 29038 bytes tutti-ui-swing/src/main/resources/sounds/0.wav | Bin 0 -> 21626 bytes tutti-ui-swing/src/main/resources/sounds/1.wav | Bin 0 -> 9636 bytes tutti-ui-swing/src/main/resources/sounds/10.wav | Bin 0 -> 20536 bytes tutti-ui-swing/src/main/resources/sounds/100.wav | Bin 0 -> 14214 bytes tutti-ui-swing/src/main/resources/sounds/1000.wav | Bin 0 -> 17048 bytes tutti-ui-swing/src/main/resources/sounds/11.wav | Bin 0 -> 15086 bytes tutti-ui-swing/src/main/resources/sounds/12.wav | Bin 0 -> 19010 bytes tutti-ui-swing/src/main/resources/sounds/13.wav | Bin 0 -> 22280 bytes tutti-ui-swing/src/main/resources/sounds/14.wav | Bin 0 -> 30564 bytes tutti-ui-swing/src/main/resources/sounds/15.wav | Bin 0 -> 21844 bytes tutti-ui-swing/src/main/resources/sounds/16.wav | Bin 0 -> 20536 bytes tutti-ui-swing/src/main/resources/sounds/17.wav | Bin 0 -> 29910 bytes tutti-ui-swing/src/main/resources/sounds/18.wav | Bin 0 -> 30782 bytes tutti-ui-swing/src/main/resources/sounds/19.wav | Bin 0 -> 31872 bytes tutti-ui-swing/src/main/resources/sounds/2.wav | Bin 0 -> 12252 bytes tutti-ui-swing/src/main/resources/sounds/20.wav | Bin 0 -> 12252 bytes tutti-ui-swing/src/main/resources/sounds/21.wav | Bin 0 -> 25986 bytes tutti-ui-swing/src/main/resources/sounds/22.wav | Bin 0 -> 24242 bytes tutti-ui-swing/src/main/resources/sounds/23.wav | Bin 0 -> 26640 bytes tutti-ui-swing/src/main/resources/sounds/24.wav | Bin 0 -> 31218 bytes tutti-ui-swing/src/main/resources/sounds/25.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/26.wav | Bin 0 -> 33398 bytes tutti-ui-swing/src/main/resources/sounds/27.wav | Bin 0 -> 32308 bytes tutti-ui-swing/src/main/resources/sounds/28.wav | Bin 0 -> 31654 bytes tutti-ui-swing/src/main/resources/sounds/29.wav | Bin 0 -> 34052 bytes tutti-ui-swing/src/main/resources/sounds/3.wav | Bin 0 -> 17048 bytes tutti-ui-swing/src/main/resources/sounds/30.wav | Bin 0 -> 24896 bytes tutti-ui-swing/src/main/resources/sounds/31.wav | Bin 0 -> 30564 bytes tutti-ui-swing/src/main/resources/sounds/32.wav | Bin 0 -> 26640 bytes tutti-ui-swing/src/main/resources/sounds/33.wav | Bin 0 -> 28384 bytes tutti-ui-swing/src/main/resources/sounds/34.wav | Bin 0 -> 32962 bytes tutti-ui-swing/src/main/resources/sounds/35.wav | Bin 0 -> 36014 bytes tutti-ui-swing/src/main/resources/sounds/36.wav | Bin 0 -> 35142 bytes tutti-ui-swing/src/main/resources/sounds/37.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/38.wav | Bin 0 -> 33398 bytes tutti-ui-swing/src/main/resources/sounds/39.wav | Bin 0 -> 35796 bytes tutti-ui-swing/src/main/resources/sounds/4.wav | Bin 0 -> 19228 bytes tutti-ui-swing/src/main/resources/sounds/40.wav | Bin 0 -> 27948 bytes tutti-ui-swing/src/main/resources/sounds/41.wav | Bin 0 -> 33616 bytes tutti-ui-swing/src/main/resources/sounds/42.wav | Bin 0 -> 29692 bytes tutti-ui-swing/src/main/resources/sounds/43.wav | Bin 0 -> 31436 bytes tutti-ui-swing/src/main/resources/sounds/44.wav | Bin 0 -> 36014 bytes tutti-ui-swing/src/main/resources/sounds/45.wav | Bin 0 -> 39066 bytes tutti-ui-swing/src/main/resources/sounds/46.wav | Bin 0 -> 38412 bytes tutti-ui-swing/src/main/resources/sounds/47.wav | Bin 0 -> 37322 bytes tutti-ui-swing/src/main/resources/sounds/48.wav | Bin 0 -> 36450 bytes tutti-ui-swing/src/main/resources/sounds/49.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/5.wav | Bin 0 -> 23588 bytes tutti-ui-swing/src/main/resources/sounds/50.wav | Bin 0 -> 33180 bytes tutti-ui-swing/src/main/resources/sounds/51.wav | Bin 0 -> 36450 bytes tutti-ui-swing/src/main/resources/sounds/52.wav | Bin 0 -> 32526 bytes tutti-ui-swing/src/main/resources/sounds/53.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/54.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/55.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/56.wav | Bin 0 -> 41246 bytes tutti-ui-swing/src/main/resources/sounds/57.wav | Bin 0 -> 40156 bytes tutti-ui-swing/src/main/resources/sounds/58.wav | Bin 0 -> 39284 bytes tutti-ui-swing/src/main/resources/sounds/59.wav | Bin 0 -> 41682 bytes tutti-ui-swing/src/main/resources/sounds/6.wav | Bin 0 -> 22280 bytes tutti-ui-swing/src/main/resources/sounds/60.wav | Bin 0 -> 35578 bytes tutti-ui-swing/src/main/resources/sounds/61.wav | Bin 0 -> 38630 bytes tutti-ui-swing/src/main/resources/sounds/62.wav | Bin 0 -> 34706 bytes tutti-ui-swing/src/main/resources/sounds/63.wav | Bin 0 -> 36232 bytes tutti-ui-swing/src/main/resources/sounds/64.wav | Bin 0 -> 41028 bytes tutti-ui-swing/src/main/resources/sounds/65.wav | Bin 0 -> 44080 bytes tutti-ui-swing/src/main/resources/sounds/66.wav | Bin 0 -> 43208 bytes tutti-ui-swing/src/main/resources/sounds/67.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/68.wav | Bin 0 -> 41464 bytes tutti-ui-swing/src/main/resources/sounds/69.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/7.wav | Bin 0 -> 21626 bytes tutti-ui-swing/src/main/resources/sounds/70.wav | Bin 0 -> 41900 bytes tutti-ui-swing/src/main/resources/sounds/71.wav | Bin 0 -> 42772 bytes tutti-ui-swing/src/main/resources/sounds/72.wav | Bin 0 -> 40810 bytes tutti-ui-swing/src/main/resources/sounds/73.wav | Bin 0 -> 41682 bytes tutti-ui-swing/src/main/resources/sounds/74.wav | Bin 0 -> 51710 bytes tutti-ui-swing/src/main/resources/sounds/75.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/76.wav | Bin 0 -> 41028 bytes tutti-ui-swing/src/main/resources/sounds/77.wav | Bin 0 -> 50402 bytes tutti-ui-swing/src/main/resources/sounds/78.wav | Bin 0 -> 51056 bytes tutti-ui-swing/src/main/resources/sounds/79.wav | Bin 0 -> 52146 bytes tutti-ui-swing/src/main/resources/sounds/8.wav | Bin 0 -> 17484 bytes tutti-ui-swing/src/main/resources/sounds/80.wav | Bin 0 -> 28166 bytes tutti-ui-swing/src/main/resources/sounds/81.wav | Bin 0 -> 35360 bytes tutti-ui-swing/src/main/resources/sounds/82.wav | Bin 0 -> 34270 bytes tutti-ui-swing/src/main/resources/sounds/83.wav | Bin 0 -> 38848 bytes tutti-ui-swing/src/main/resources/sounds/84.wav | Bin 0 -> 43862 bytes tutti-ui-swing/src/main/resources/sounds/85.wav | Bin 0 -> 46696 bytes tutti-ui-swing/src/main/resources/sounds/86.wav | Bin 0 -> 46042 bytes tutti-ui-swing/src/main/resources/sounds/87.wav | Bin 0 -> 44734 bytes tutti-ui-swing/src/main/resources/sounds/88.wav | Bin 0 -> 39938 bytes tutti-ui-swing/src/main/resources/sounds/89.wav | Bin 0 -> 42554 bytes tutti-ui-swing/src/main/resources/sounds/9.wav | Bin 0 -> 20972 bytes tutti-ui-swing/src/main/resources/sounds/90.wav | Bin 0 -> 42118 bytes tutti-ui-swing/src/main/resources/sounds/91.wav | Bin 0 -> 40592 bytes tutti-ui-swing/src/main/resources/sounds/92.wav | Bin 0 -> 40592 bytes tutti-ui-swing/src/main/resources/sounds/93.wav | Bin 0 -> 44080 bytes tutti-ui-swing/src/main/resources/sounds/94.wav | Bin 0 -> 54108 bytes tutti-ui-swing/src/main/resources/sounds/95.wav | Bin 0 -> 45606 bytes tutti-ui-swing/src/main/resources/sounds/96.wav | Bin 0 -> 43644 bytes tutti-ui-swing/src/main/resources/sounds/97.wav | Bin 0 -> 51492 bytes tutti-ui-swing/src/main/resources/sounds/98.wav | Bin 0 -> 52364 bytes tutti-ui-swing/src/main/resources/sounds/99.wav | Bin 0 -> 53454 bytes tutti-ui-swing/src/main/resources/sounds/cm.wav | Bin 0 -> 37322 bytes tutti-ui-swing/src/main/resources/sounds/mm.wav | Bin 0 -> 32090 bytes .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 29 ++ tutti-ui-swing/src/test/resources/log4j.properties | 2 + 137 files changed, 1058 insertions(+), 103 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.car copy tutti-service/src/test/resources/pupitri/{evo-6592.tnk => evo-6116.tnk} (100%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.tuttiProtocol create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIModel.java create mode 100755 tutti-ui-swing/src/main/resources/sounds/,.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/0.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/1.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/10.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/100.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/1000.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/11.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/12.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/13.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/14.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/15.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/16.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/17.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/18.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/19.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/2.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/20.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/21.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/22.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/23.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/24.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/25.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/26.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/27.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/28.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/29.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/3.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/30.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/31.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/32.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/33.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/34.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/35.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/36.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/37.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/38.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/39.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/4.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/40.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/41.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/42.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/43.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/44.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/45.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/46.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/47.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/48.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/49.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/5.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/50.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/51.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/52.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/53.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/54.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/55.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/56.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/57.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/58.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/59.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/6.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/60.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/61.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/62.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/63.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/64.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/65.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/66.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/67.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/68.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/69.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/7.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/70.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/71.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/72.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/73.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/74.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/75.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/76.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/77.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/78.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/79.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/8.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/80.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/81.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/82.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/83.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/84.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/85.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/86.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/87.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/88.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/89.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/9.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/90.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/91.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/92.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/93.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/94.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/95.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/96.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/97.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/98.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/99.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/cm.wav create mode 100755 tutti-ui-swing/src/main/resources/sounds/mm.wav create mode 100644 tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.