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

branch develop updated (02f97ea -> 342d5b9)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 02f97ea Gestion de la nullité du quota dans l'algorithme new 342d5b9 Bien recalculer le cache des échantillons lors d'un import multi-poste 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 342d5b93905dc1320497a193a1bfe2a2aa508e48 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 18:17:53 2016 +0200 Bien recalculer le cache des échantillons lors d'un import multi-poste Summary of changes: .../frequency/IndividualObservationBatchTableHandler.java | 4 ++-- .../species/frequency/IndividualObservationUICache.java | 14 ++++++++++---- .../species/frequency/SpeciesFrequencyUIHandler.java | 6 +++--- .../actions/ImportMultiPostSpeciesSupportAction.java | 9 +++++++-- .../frequency/actions/ResetSpeciesFrequencyAction.java | 3 +-- 5 files changed, 23 insertions(+), 13 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 (f1d0845 -> 02f97ea)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from f1d0845 libération de listeners quand on quitte l'écran new b780b8e Le sexe a changé... new 820b1e5 il se peut que ni la taille, ni le poids n'ai changé new 02f97ea Gestion de la nullité du quota dans l'algorithme The 3 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 02f97ea5a418fbb9c533025be3185fc4bd3d9b78 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 17:23:31 2016 +0200 Gestion de la nullité du quota dans l'algorithme commit 820b1e595958c36fb6fef8f99c12879b6f3d4981 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 16:41:41 2016 +0200 il se peut que ni la taille, ni le poids n'ai changé commit b780b8ee3111b5f9bee2bf4a57778e65aaa2b6f1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 16:41:10 2016 +0200 Le sexe a changé... Summary of changes: .../sampling/IndividualObservationSamplingStatus.java | 15 +++++++++------ .../frequency/IndividualObservationBatchTableHandler.java | 3 ++- .../frequency/IndividualObservationToFrequencyEngine.java | 9 ++++++--- 3 files changed, 17 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8238 created (now eb69d62)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8238 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at eb69d62 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) This branch includes the following new commits: new eb69d62 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) 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 eb69d62e80a76b2a7f93ae3e00e1d61d95b3746c Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Apr 22 15:44:36 2016 +0200 - passage à jaxx 2.29 - désactivation de la suppresion des maturités sélectionnées si elles sont utilisées (RAF : gérer la suppression des lignes d'espèce ou de benthos) (refs #8238) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (faa62fe -> f1d0845)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from faa62fe Livrable #7459 Merge branch 'feature/7459' into develop new f1d0845 libération de listeners quand on quitte l'écran 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 f1d0845df1a27e41c404a6c1e649aba25c39f88f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 15:31:50 2016 +0200 libération de listeners quand on quitte l'écran Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 55 ++++++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/refactor_external_devices created (now 839a37c)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/refactor_external_devices in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 839a37c Ajout d'un nouveau handler dédié aux external devices This branch includes the following new commits: new 839a37c Ajout d'un nouveau handler dédié aux external devices 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 839a37cf2518fc591613321017023ee77c35ae95 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 15:26:28 2016 +0200 Ajout d'un nouveau handler dédié aux external devices -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c47e59e -> faa62fe)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from c47e59e Revue du changement de mode de recopie adds 2b893cc renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) adds 70c6707 creation du module pour le pied à coulisse (caliper) (refs #7459) adds 5c79f17 implem de la réception des données du pied a coulisse (refs #7459) adds fa669e5 ajout de la conf du port série du pied a coulisse (refs #7459) adds 0ad86dc ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) adds 1961579 lecture des données reçues sur le pied à coulisse (refs #7459) adds 6607ccd modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) adds 6500c3c affichage du port série écouté dans la barre de statut (refs #7459) adds b8e1fa0 modif de l'icone du pied à coulisse (fixes #7459) adds 151e005 Fix import from merge adds 593e87e Meilleur gestion des dépendences adds 9e61304 Pouvoir éditer des int dans l'éditeur de configuration adds c8b8e53 Reformat code adds 01a9569 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) new 26cfd5f Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif new faa62fe Livrable #7459 Merge branch 'feature/7459' into develop The 2 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 faa62fe9a1a86e1252782acbe9183d5b22c807c6 Merge: c47e59e 26cfd5f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 14:56:40 2016 +0200 Livrable #7459 Merge branch 'feature/7459' into develop commit 26cfd5f57e3f1d9369734a80e2c8b6fbac99e57f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 14:20:46 2016 +0200 Bien fermer la connection au pied à coulisse lorsque l'on ferme le contexte applicatif Summary of changes: pom.xml | 8 + {tutti-ui-swing => tutti-caliper}/LICENSE.txt | 0 {tutti-ui-swing => tutti-caliper}/README.md | 0 {tutti-ui-swing-updater => tutti-caliper}/pom.xml | 78 ++++---- .../caliper/feed/CaliperConnectionException.java | 14 +- .../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 +- ...{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 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 28 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 31 ++-- .../i18n/tutti-persistence_en_GB.properties | 8 + .../i18n/tutti-persistence_fr_FR.properties | 13 +- tutti-ui-swing/pom.xml | 5 + .../filtered-resources/tutti-help-fr.properties | 28 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 36 +++- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 3 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 30 +++ .../tutti/ui/swing/content/MainUIHandler.java | 25 ++- .../content/actions/ConnectCaliperAction.java | 74 ++++++++ .../content/actions/ConnectIchtyometerAction.java | 6 +- ...terAction.java => DisconnectCaliperAction.java} | 22 +-- .../actions/DisconnectIchtyometerAction.java | 4 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +++--- .../frequency/SpeciesFrequencyUIHandler.java | 105 +++++++++-- .../actions/ApplySpeciesFrequencyRafaleAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 23 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 33 +++- .../main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes 42 files changed, 791 insertions(+), 301 deletions(-) copy {tutti-ui-swing => tutti-caliper}/LICENSE.txt (100%) copy {tutti-ui-swing => tutti-caliper}/README.md (100%) copy {tutti-ui-swing-updater => tutti-caliper}/pom.xml (52%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/BatchSavedListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperConnectionException.java (77%) create mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperFeedReader.java copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderEvent.java (61%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/event/CaliperFeedReaderListener.java (76%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderMeasureRecord.java (78%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordFactory.java (51%) copy tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java => tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderRecordSupport.java (82%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReader.java => IchtyometerFeedReader.java} (73%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderEvent.java => IchtyometerFeedReaderEvent.java} (66%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/{FeedReaderListener.java => IchtyometerFeedReaderListener.java} (89%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderMeasureRecord.java => IchtyometerFeedReaderMeasureRecord.java} (93%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordFactory.java => IchtyometerFeedReaderRecordFactory.java} (65%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderRecordSupport.java => IchtyometerFeedReaderRecordSupport.java} (91%) rename tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/{FeedReaderStylusMotionRecord.java => IchtyometerFeedReaderStylusMotionRecord.java} (92%) rename tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/{FeedReaderTest.java => IchtyometerFeedReaderTest.java} (81%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectCaliperAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/{DisconnectIchtyometerAction.java => DisconnectCaliperAction.java} (65%) create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-down.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-caliper-up.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/7459 deleted (was 01a9569)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was 01a9569 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7459 updated (9e61304 -> 01a9569)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 9e61304 Pouvoir éditer des int dans l'éditeur de configuration new c8b8e53 Reformat code new 01a9569 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) The 2 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 01a9569cad51fedb6124178988bffe58e22e72fa Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 14:00:44 2016 +0200 Meilleure gestion de l'erreur de connection au pied à coulisse (See #7459) commit c8b8e5382a23f44019c48b4a785a5b51a0dcda36 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 13:49:53 2016 +0200 Reformat code Summary of changes: .../ui/swing/content/actions/ConnectCaliperAction.java | 10 +++++++++- .../ui/swing/content/config/TuttiConfigUIHandler.java | 17 ++++++++--------- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 4 files changed, 19 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/7459 updated (593e87e -> 9e61304)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 593e87e Meilleur gestion des dépendences new 9e61304 Pouvoir éditer des int dans l'éditeur de configuration 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 9e61304c649326f443e0e1da8b82fbb5fd1b8886 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 13:48:15 2016 +0200 Pouvoir éditer des int dans l'éditeur de configuration Summary of changes: .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7459 updated (aae9b0f -> 593e87e)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits aae9b0f modif de l'icone du pied à coulisse (fixes #7459) omits ed81d11 affichage du port série écouté dans la barre de statut (refs #7459) omits 4670088 modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) omits 0241863 lecture des données reçues sur le pied à coulisse (refs #7459) omits a13af77 ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) omits 1a3421d ajout de la conf du port série du pied a coulisse (refs #7459) omits f70c0d6 implem de la réception des données du pied a coulisse (refs #7459) omits 0388a1f creation du module pour le pied à coulisse (caliper) (refs #7459) omits 43c87bf renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) adds d0bfe06 Déplacement du cache de haut niveau dans un paquetage plus adapté + amélioration code dans le cache (côté ui) adds 2dad5f3 Revue de comment interroger le cache adds 2488271 Utilisation d'un nouvel handler pour gérer la zone de notification adds 9025fe4 Ajout d'états sur le cache d'ui adds e7dec7b Revue de la zone de notification adds 2ce988a Suppression des listeners sur le cache + revue du code du cache adds 41059a9 Suppression du statut de la ligne d'une observation (cela pose des problème sur la sélection dans par exemple l'éditeur des code de prélèvement qui se déclanche avant que la ligne soit sélectionnée) adds 48d0e06 Revue du modèle de la zone de notification et de son handler adds e899b8a traduction perdue adds af55cbb Renommage méthode + suppression méthode non utilisée adds 7de63b3 Normalement on a le bon flow pour la rafraichissement de la zone de notification des prélèvements + nettoyage de code adds d8e5c5f Retour sur develop, car déjà trop de modifications... mais non fini Merge branch 'feature/revue_algorithme' into develop adds b65b154 si on modifie la catégorie vrac/hors vrac, on met à jour le compte de lots vrac/hors vrac (fixes #8255) adds eba83d2 Merge branch 'feature/8255' into 'develop' adds 3de3001 Fix npe... Refs #8263 adds 3886a2d Livrable #8263 Merge branch 'feature/8263' into develop adds efe729c Ne pas tenter de supprimer des lots déjà supprimés (See #8261) adds 4807b51 Livrable #8261 Merge branch 'feature/8261' into develop adds f6c2f9d Correction lors de l'import des mensurations en multi-poste (See #8249) adds 7ed9bfc Livrable #8249 Merge branch 'feature/8249' into develop adds 3191b67 Changement du message lors de l'erreur d'un import (See #8247) adds 524e139 Livrable #8247 Merge branch 'feature/8247' into develop adds 41feecb Ne plus cacher le status dans la zone de notification adds 72ca87d Ne plus conserver les états dans le modèle de zone de notification + renommage propriété adds c74e5c1 Si un des max est atteint on ne propose plus de prélever adds 8cd62f9 Amélioration des logs sur le cache adds 5f9e52e Introduction d'une requète sur le cache d'échantillons + amélioration du cache adds c316995 Utilisation de la requete sur le cache d'échantillon + continue à simplifier et assainir le code adds bac64af Fin du ménage même s'il reste encore des choses à revoir... adds 50f07c7 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop adds e2b2a0e Clean code adds 29ac08e Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) adds 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop adds c47e59e Revue du changement de mode de recopie new 2b893cc renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) new 70c6707 creation du module pour le pied à coulisse (caliper) (refs #7459) new 5c79f17 implem de la réception des données du pied a coulisse (refs #7459) new fa669e5 ajout de la conf du port série du pied a coulisse (refs #7459) new 0ad86dc ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) new 1961579 lecture des données reçues sur le pied à coulisse (refs #7459) new 6607ccd modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) new 6500c3c affichage du port série écouté dans la barre de statut (refs #7459) new b8e1fa0 modif de l'icone du pied à coulisse (fixes #7459) new 151e005 Fix import from merge new 593e87e Meilleur gestion des dépendences 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 (aae9b0f) \ N -- N -- N refs/heads/feature/7459 (593e87e) 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. The 11 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 593e87e06c560e2a7b3ee47ac9d44716e65aaca5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 13:35:31 2016 +0200 Meilleur gestion des dépendences commit 151e00570056132eb6eff7cc0f6a047a47031fa6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 13:35:18 2016 +0200 Fix import from merge commit b8e1fa0dac2f5269b71a39c181ca9a64dd05556c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Apr 21 11:49:44 2016 +0200 modif de l'icone du pied à coulisse (fixes #7459) commit 6500c3c4165e40ecc0efd10149dad6943392ce7f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Apr 21 10:30:12 2016 +0200 affichage du port série écouté dans la barre de statut (refs #7459) commit 6607ccdc4b4b3495418136a7e828759244301b3a Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Apr 21 10:28:40 2016 +0200 modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) commit 19615796d8980283f913f3bc8a6aa5569937da9e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Apr 21 10:27:04 2016 +0200 lecture des données reçues sur le pied à coulisse (refs #7459) commit 0ad86dc1263c7303e33d2f5c90bbb226effef4f3 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 20 16:16:55 2016 +0200 ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) commit fa669e59b30830fcb51a434ed5e941c34ef2e2a3 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 20 15:34:01 2016 +0200 ajout de la conf du port série du pied a coulisse (refs #7459) commit 5c79f17385017c8b0614fdd48ef3059d7f6ff4da Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Apr 20 15:21:16 2016 +0200 implem de la réception des données du pied a coulisse (refs #7459) commit 70c6707dc809d7c4f48143504403bd509d5fcdf9 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 19 17:54:34 2016 +0200 creation du module pour le pied à coulisse (caliper) (refs #7459) commit 2b893ccf555cbd52cbe08b42db6fc933ad83c787 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Apr 19 17:37:33 2016 +0200 renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459) Summary of changes: pom.xml | 7 + tutti-caliper/pom.xml | 14 +- .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 4 +- .../catches/multipost/MultiPostImportService.java | 20 +- .../service/{sampling => cruise}/CruiseCache.java | 4 +- .../{sampling => cruise}/CruiseCacheAble.java | 2 +- .../{sampling => cruise}/CruiseCacheLoader.java | 4 +- .../cps/CalcifiedPiecesSamplingExportService.java | 2 +- ...cesSamplingAlgorithmEntryNotFoundException.java | 15 + .../service/sampling/CruiseSamplingCache.java | 726 +++++++++------------ .../sampling/CruiseSamplingInternalCache.java | 147 ++--- .../IndividualObservationSamplingCacheRequest.java | 80 +++ .../IndividualObservationSamplingContext.java | 148 +++++ .../IndividualObservationSamplingStatus.java | 141 ++++ ...lObservationSamplingStatusExceptionSupport.java | 28 + .../tutti/service/sampling/SamplingCodeCache.java | 1 + .../tutti/service/sampling/SamplingEvent.java | 105 --- .../tutti/service/sampling/SamplingListener.java | 39 -- ...NotDefinedOnIndividualObservationException.java | 15 + .../ZoneNotDefinedOnFishingOperationException.java | 15 + .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../CalcifiedPiecesSamplingReportAction.java | 2 +- .../SamplingCodeCellEditor.java | 2 +- .../ChangeSpeciesBatchSampleCategoryAction.java | 22 +- .../edit/actions/RemoveSpeciesBatchAction.java | 8 +- .../IndividualObservationBatchRowModel.java | 21 +- .../IndividualObservationBatchRowState.java | 38 +- .../IndividualObservationBatchTableHandler.java | 535 +++++++-------- .../IndividualObservationBatchTableModel.java | 14 +- .../IndividualObservationBatchUIModel.java | 15 + ...dividualObservationToSamplingCacheResolver.java | 147 +++++ .../frequency/IndividualObservationUICache.java | 529 ++++----------- .../frequency/SamplingNotificationZoneHandler.java | 331 ++++++++++ .../frequency/SamplingNotificationZoneModel.java | 35 + .../frequency/SamplingNotificationZoneStatus.java | 15 + .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 6 +- .../species/frequency/SpeciesFrequencyUI.jcss | 4 - .../frequency/SpeciesFrequencyUIHandler.java | 309 +++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 164 ++--- .../actions/ApplySpeciesFrequencyRafaleAction.java | 51 +- .../actions/CancelEditSpeciesFrequencyAction.java | 15 +- .../frequency/actions/EditSampleCodeAction.java | 52 +- .../frequency/actions/RemoveObservationAction.java | 8 +- .../actions/ResetSpeciesFrequencyAction.java | 13 +- .../content/protocol/EditProtocolUIModel.java | 4 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 52 files changed, 2117 insertions(+), 1761 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCache.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCacheAble.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{sampling => cruise}/CruiseCacheLoader.java (97%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CalcifiedPiecesSamplingAlgorithmEntryNotFoundException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingCacheRequest.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatus.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingStatusExceptionSupport.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingEvent.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingListener.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SizeNotDefinedOnIndividualObservationException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/ZoneNotDefinedOnFishingOperationException.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheResolver.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SamplingNotificationZoneStatus.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10