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

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

01/11: renommage des classes de l'ichtyometre en vue de l'ajout de module du pied à coulisse, pour eviter les confusions (refs #7459)
by codelutin.com scm 22 Apr '16

22 Apr '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7459 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git 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) --- ...{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 ++--- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 8 ++-- .../tutti/ui/swing/content/MainUIHandler.java | 4 +- .../content/actions/ConnectIchtyometerAction.java | 6 +-- .../actions/DisconnectIchtyometerAction.java | 4 +- .../frequency/SpeciesFrequencyUIHandler.java | 16 ++++---- 14 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java similarity index 73% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java index 19ce998..520c550 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReader.java @@ -25,11 +25,11 @@ package fr.ifremer.tutti.ichtyometer.feed; import com.google.common.base.Preconditions; import com.google.common.io.Closeables; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordFactory; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderRecordSupport; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderEvent; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderRecordFactory; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderRecordSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -47,10 +47,10 @@ import java.io.IOException; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.1 */ -public class FeedReader implements Closeable { +public class IchtyometerFeedReader implements Closeable { /** Logger. */ - private static final Log log = LogFactory.getLog(FeedReader.class); + private static final Log log = LogFactory.getLog(IchtyometerFeedReader.class); /** * Ichtyometer client given in the {@code start} method. @@ -63,7 +63,7 @@ public class FeedReader implements Closeable { protected ReadingRunnable readingRunnable; /** - * To keep list of {@link FeedReaderListener} listeners. + * To keep list of {@link IchtyometerFeedReaderListener} listeners. */ protected final EventListenerList listenerList; @@ -72,11 +72,11 @@ public class FeedReader implements Closeable { * * @since 3.10 */ - protected final FeedReaderRecordFactory recordFactory; + protected final IchtyometerFeedReaderRecordFactory recordFactory; - public FeedReader() { + public IchtyometerFeedReader() { listenerList = new EventListenerList(); - recordFactory = new FeedReaderRecordFactory(); + recordFactory = new IchtyometerFeedReaderRecordFactory(); } public void start(IchtyometerClient client) throws IOException { @@ -121,17 +121,17 @@ public class FeedReader implements Closeable { return client.getName(); } - public void addFeedModeReaderListener(FeedReaderListener listener) { - listenerList.add(FeedReaderListener.class, listener); + public void addFeedModeReaderListener(IchtyometerFeedReaderListener listener) { + listenerList.add(IchtyometerFeedReaderListener.class, listener); } - public void removeFeedModeReaderListener(FeedReaderListener listener) { - listenerList.remove(FeedReaderListener.class, listener); + public void removeFeedModeReaderListener(IchtyometerFeedReaderListener listener) { + listenerList.remove(IchtyometerFeedReaderListener.class, listener); } public void removeAllFeedModeReaderListeners() { - for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { - listenerList.remove(FeedReaderListener.class, listener); + for (IchtyometerFeedReaderListener listener : listenerList.getListeners(IchtyometerFeedReaderListener.class)) { + listenerList.remove(IchtyometerFeedReaderListener.class, listener); } } @@ -166,13 +166,13 @@ public class FeedReader implements Closeable { try { // get a new record - FeedReaderRecordSupport readerRecord = readRecord(dataInputStream); + IchtyometerFeedReaderRecordSupport readerRecord = readRecord(dataInputStream); - if (!stop && readerRecord != null && readerRecord instanceof FeedReaderMeasureRecord) { + if (!stop && readerRecord != null && readerRecord instanceof IchtyometerFeedReaderMeasureRecord) { // send new record to listeners - FeedReaderEvent e = new FeedReaderEvent(FeedReader.this, (FeedReaderMeasureRecord) readerRecord); - for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + IchtyometerFeedReaderEvent e = new IchtyometerFeedReaderEvent(IchtyometerFeedReader.this, (IchtyometerFeedReaderMeasureRecord) readerRecord); + for (IchtyometerFeedReaderListener listener : listenerList.getListeners(IchtyometerFeedReaderListener.class)) { listener.recordRead(e); } @@ -189,7 +189,7 @@ public class FeedReader implements Closeable { } } - protected FeedReaderRecordSupport readRecord(DataInputStream dataInputStream) throws IOException { + protected IchtyometerFeedReaderRecordSupport readRecord(DataInputStream dataInputStream) throws IOException { String result = ""; @@ -217,7 +217,7 @@ public class FeedReader implements Closeable { } } - FeedReaderRecordSupport readerRecord = null; + IchtyometerFeedReaderRecordSupport readerRecord = null; if (!stop) { diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java similarity index 66% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java index bad4167..be067fd 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderEvent.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderEvent.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ichtyometer.feed.event; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; import java.util.EventObject; @@ -33,23 +33,23 @@ import java.util.EventObject; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.1 */ -public class FeedReaderEvent extends EventObject { +public class IchtyometerFeedReaderEvent extends EventObject { private static final long serialVersionUID = 1L; - protected final FeedReaderMeasureRecord record; + protected final IchtyometerFeedReaderMeasureRecord record; - public FeedReaderEvent(FeedReader source, FeedReaderMeasureRecord record) { + public IchtyometerFeedReaderEvent(IchtyometerFeedReader source, IchtyometerFeedReaderMeasureRecord record) { super(source); this.record = record; } @Override - public FeedReader getSource() { - return (FeedReader) super.getSource(); + public IchtyometerFeedReader getSource() { + return (IchtyometerFeedReader) super.getSource(); } - public FeedReaderMeasureRecord getRecord() { + public IchtyometerFeedReaderMeasureRecord getRecord() { return record; } } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java similarity index 89% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java index b4a728d..e7373f9 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/FeedReaderListener.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/event/IchtyometerFeedReaderListener.java @@ -32,13 +32,13 @@ import java.util.EventListener; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.1 */ -public interface FeedReaderListener extends EventListener { +public interface IchtyometerFeedReaderListener extends EventListener { /** * When a new record was read. * * @param event event containing the new read record */ - void recordRead(FeedReaderEvent event); + void recordRead(IchtyometerFeedReaderEvent event); } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java similarity index 93% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java index 362537e..4444e88 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderMeasureRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderMeasureRecord.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.10 */ -public class FeedReaderMeasureRecord extends FeedReaderRecordSupport { +public class IchtyometerFeedReaderMeasureRecord extends IchtyometerFeedReaderRecordSupport { private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class FeedReaderMeasureRecord extends FeedReaderRecordSupport { protected final int measure; - FeedReaderMeasureRecord(String record) { + IchtyometerFeedReaderMeasureRecord(String record) { super(record); Matcher matcher = RECORD_PATTERN.matcher(record); matcher.find(); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java similarity index 65% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java index 829833a..2c51729 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordFactory.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordFactory.java @@ -33,40 +33,40 @@ import java.util.Set; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.10 */ -public class FeedReaderRecordFactory { +public class IchtyometerFeedReaderRecordFactory { protected final Set<FeedReaderRecordAceptor> acceptors; - public FeedReaderRecordFactory() { + public IchtyometerFeedReaderRecordFactory() { acceptors = new LinkedHashSet<>(); - acceptors.add(new FeedReaderRecordAceptor<FeedReaderStylusMotionRecord>() { + acceptors.add(new FeedReaderRecordAceptor<IchtyometerFeedReaderStylusMotionRecord>() { @Override public boolean accept(String record) { - return FeedReaderStylusMotionRecord.acceptRecord(record); + return IchtyometerFeedReaderStylusMotionRecord.acceptRecord(record); } @Override - public FeedReaderStylusMotionRecord newRecord(String record) { - return new FeedReaderStylusMotionRecord(record); + public IchtyometerFeedReaderStylusMotionRecord newRecord(String record) { + return new IchtyometerFeedReaderStylusMotionRecord(record); } }); - acceptors.add(new FeedReaderRecordAceptor<FeedReaderMeasureRecord>() { + acceptors.add(new FeedReaderRecordAceptor<IchtyometerFeedReaderMeasureRecord>() { @Override public boolean accept(String record) { - return FeedReaderMeasureRecord.acceptRecord(record); + return IchtyometerFeedReaderMeasureRecord.acceptRecord(record); } @Override - public FeedReaderMeasureRecord newRecord(String record) { - return new FeedReaderMeasureRecord(record); + public IchtyometerFeedReaderMeasureRecord newRecord(String record) { + return new IchtyometerFeedReaderMeasureRecord(record); } }); } - public FeedReaderRecordSupport newRecord(String record) { + public IchtyometerFeedReaderRecordSupport newRecord(String record) { - FeedReaderRecordSupport feedRecord = null; + IchtyometerFeedReaderRecordSupport feedRecord = null; for (FeedReaderRecordAceptor acceptor : acceptors) { @@ -84,7 +84,7 @@ public class FeedReaderRecordFactory { } - protected static interface FeedReaderRecordAceptor<F extends FeedReaderRecordSupport> { + protected static interface FeedReaderRecordAceptor<F extends IchtyometerFeedReaderRecordSupport> { boolean accept(String record); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java similarity index 91% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java index 175e04f..0dddea7 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderRecordSupport.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderRecordSupport.java @@ -35,7 +35,7 @@ import java.io.Serializable; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.10 */ -public abstract class FeedReaderRecordSupport implements Serializable{ +public abstract class IchtyometerFeedReaderRecordSupport implements Serializable{ private static final long serialVersionUID = 1L; @@ -44,7 +44,7 @@ public abstract class FeedReaderRecordSupport implements Serializable{ */ protected final String record; - protected FeedReaderRecordSupport(String record) { + protected IchtyometerFeedReaderRecordSupport(String record) { this.record = record; Preconditions.checkState(isValid()); } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java similarity index 92% rename from tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java rename to tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java index 2df31f1..97d0fbe 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/FeedReaderStylusMotionRecord.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/record/IchtyometerFeedReaderStylusMotionRecord.java @@ -39,7 +39,7 @@ import java.util.regex.Pattern; * @author Tony Chemit - chemit(a)codelutin.com * @since 3.10 */ -public class FeedReaderStylusMotionRecord extends FeedReaderRecordSupport { +public class IchtyometerFeedReaderStylusMotionRecord extends IchtyometerFeedReaderRecordSupport { private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ public class FeedReaderStylusMotionRecord extends FeedReaderRecordSupport { protected final int motion; - FeedReaderStylusMotionRecord(String record) { + IchtyometerFeedReaderStylusMotionRecord(String record) { super(record); Matcher matcher = RECORD_PATTERN.matcher(record); matcher.find(); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java index 164a6e8..bc34f76 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java @@ -25,8 +25,8 @@ package fr.ifremer.tutti.ichtyometer.tool; import com.google.common.collect.Lists; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; import java.io.Console; import java.io.IOException; @@ -70,11 +70,11 @@ public class FeedReaderTool { client.open(remoteDeviceChooser, true); - FeedReader reader = new FeedReader(); + IchtyometerFeedReader reader = new IchtyometerFeedReader(); writer.println("client " + client + " is open and listen the board"); - FeedReaderListener listener = event -> writer.println("New record: " + event.getRecord()); + IchtyometerFeedReaderListener listener = event -> writer.println("New record: " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java similarity index 81% rename from tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java rename to tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java index fa81b8a..7af78e1 100644 --- a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java +++ b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/IchtyometerFeedReaderTest.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ichtyometer.feed; import fr.ifremer.tutti.ichtyometer.BigFins; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -41,10 +41,10 @@ import java.io.IOException; * @since 3.1 */ @Ignore -public class FeedReaderTest { +public class IchtyometerFeedReaderTest { /** Logger. */ - private static final Log log = LogFactory.getLog(FeedReaderTest.class); + private static final Log log = LogFactory.getLog(IchtyometerFeedReaderTest.class); protected IchtyometerClient client; @@ -67,9 +67,9 @@ public class FeedReaderTest { @Test public void testFeedMode() throws IOException, InterruptedException { - FeedReader reader = new FeedReader(); + IchtyometerFeedReader reader = new IchtyometerFeedReader(); - FeedReaderListener listener = event -> log.info("Reader " + event.getSource() + " read : " + event.getRecord()); + IchtyometerFeedReaderListener listener = event -> log.info("Reader " + event.getSource() + " read : " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index f7e5919..748691b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.TuttiConfiguration; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.ClosedPersistenceService; import fr.ifremer.tutti.service.DecoratorService; @@ -285,7 +285,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage * * @since 3.1 */ - private FeedReader ichtyometerReader; + private IchtyometerFeedReader ichtyometerReader; /** * A file lock to prevent multiple instance. the lock is create in the {@link #init()} method and remove in the @@ -1115,11 +1115,11 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage //-- Ichtyometer methods --// //------------------------------------------------------------------------// - public FeedReader getIchtyometerReader() { + public IchtyometerFeedReader getIchtyometerReader() { return ichtyometerReader; } - public void setIchtyometerReader(FeedReader ichtyometerReader) { + public void setIchtyometerReader(IchtyometerFeedReader ichtyometerReader) { this.ichtyometerReader = ichtyometerReader; firePropertyChange(PROPERTY_ICHTYOMETER_CONNECTED, null, isIchtyometerConnected()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java index c544966..08c7ce2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content; */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; @@ -96,7 +96,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI public String getIchtyometerStatusTip(boolean connected) { String result; if (connected) { - FeedReader ichtyometerReader = getModel().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getModel().getIchtyometerReader(); result = t("tutti.ichtyometer.status.connected.tip", ichtyometerReader.getClientName()); } else { result = t("tutti.ichtyometer.status.not.connected.tip"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java index 9729a67..97a646c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ichtyometer.LocalDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; import fr.ifremer.tutti.ichtyometer.RemoteDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceServiceNotFoundException; -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -80,7 +80,7 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { } catch (RemoteDeviceServiceNotFoundException e) { throw new ApplicationBusinessException(t("tutti.ichtyometer.error.no.remote.device.service")); } - FeedReader ichtyometerReader = new FeedReader(); + IchtyometerFeedReader ichtyometerReader = new IchtyometerFeedReader(); ichtyometerReader.start(client); getContext().setIchtyometerReader(ichtyometerReader); @@ -90,7 +90,7 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { public void postSuccessAction() { super.postSuccessAction(); - FeedReader ichtyometerReader = getContext().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getContext().getIchtyometerReader(); String clientName = ichtyometerReader.getClientName(); sendMessage(t("tutti.ichtyometer.connection.establish", clientName)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java index c372d8a..ea526ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/DisconnectIchtyometerAction.java @@ -22,7 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.actions; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.FeedReader; +import fr.ifremer.tutti.ichtyometer.feed.IchtyometerFeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.io.IOUtils; @@ -45,7 +45,7 @@ public class DisconnectIchtyometerAction extends AbstractMainUITuttiAction { @Override public void doAction() throws Exception { - FeedReader ichtyometerReader = getContext().getIchtyometerReader(); + IchtyometerFeedReader ichtyometerReader = getContext().getIchtyometerReader(); // there is a feed reader, stop it now IOUtils.closeQuietly(ichtyometerReader); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 51f46cf..f05ea82 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; * #L% */ -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; -import fr.ifremer.tutti.ichtyometer.feed.record.FeedReaderMeasureRecord; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderEvent; +import fr.ifremer.tutti.ichtyometer.feed.event.IchtyometerFeedReaderListener; +import fr.ifremer.tutti.ichtyometer.feed.record.IchtyometerFeedReaderMeasureRecord; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; @@ -128,7 +128,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci /** * To consume measures when they arrive from the ichtyometer. */ - protected final FeedReaderListener feedReaderListener; + protected final IchtyometerFeedReaderListener feedReaderListener; protected ApplySpeciesFrequencyRafaleAction applySpeciesFrequencyRafaleAction; @@ -149,11 +149,11 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci SpeciesFrequencyRowModel.PROPERTY_NUMBER, SpeciesFrequencyRowModel.PROPERTY_WEIGHT); - this.feedReaderListener = new FeedReaderListener() { + this.feedReaderListener = new IchtyometerFeedReaderListener() { @Override - public void recordRead(FeedReaderEvent event) { - final FeedReaderMeasureRecord record = event.getRecord(); + public void recordRead(IchtyometerFeedReaderEvent event) { + final IchtyometerFeedReaderMeasureRecord record = event.getRecord(); SwingUtilities.invokeLater( () -> { @@ -914,7 +914,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci return col; } - protected void consumeFeedRecord(FeedReaderMeasureRecord record) { + protected void consumeFeedRecord(IchtyometerFeedReaderMeasureRecord record) { if (record.isValid()) { String unit = getModel().getLengthStepCaracteristicUnit(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (03a5c31 -> c47e59e)
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 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop new c47e59e Revue du changement de mode de recopie 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 c47e59e90f363b6b8f3baa4eda895f7ff71a47c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 13:13:40 2016 +0200 Revue du changement de mode de recopie Summary of changes: .../IndividualObservationBatchTableHandler.java | 59 ------------------ .../species/frequency/SpeciesFrequencyUI.jaxx | 6 +- .../frequency/SpeciesFrequencyUIHandler.java | 70 ++++++++++++++++++++++ .../species/frequency/SpeciesFrequencyUIModel.java | 33 ++++------ 4 files changed, 83 insertions(+), 85 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 (50f07c7 -> 03a5c31)
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 50f07c7 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop new e2b2a0e Clean code new 29ac08e Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) new 03a5c31 Livrable #8202 Merge branch 'feature/8202' into develop 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 03a5c31cbc5180512a0468322ade6d957a463bd6 Merge: e2b2a0e 29ac08e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 10:50:09 2016 +0200 Livrable #8202 Merge branch 'feature/8202' into develop commit 29ac08ef42fb729041920da906325680c6f16f89 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 10:50:07 2016 +0200 Compacter la table des observations individuelles à l'ouverture de l'écran (See #8202) commit e2b2a0e144dec038a2509a2959fd037a5da6831e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 10:46:58 2016 +0200 Clean code Summary of changes: .../IndividualObservationBatchTableHandler.java | 2 ++ .../species/frequency/SpeciesFrequencyUIModel.java | 28 ---------------------- 2 files changed, 2 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (524e139 -> 50f07c7)
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 524e139 Livrable #8247 Merge branch 'feature/8247' into develop new 41feecb Ne plus cacher le status dans la zone de notification new 72ca87d Ne plus conserver les états dans le modèle de zone de notification + renommage propriété new c74e5c1 Si un des max est atteint on ne propose plus de prélever new 8cd62f9 Amélioration des logs sur le cache new 5f9e52e Introduction d'une requète sur le cache d'échantillons + amélioration du cache new c316995 Utilisation de la requete sur le cache d'échantillon + continue à simplifier et assainir le code new bac64af Fin du ménage même s'il reste encore des choses à revoir... new 50f07c7 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop The 8 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 50f07c7c218c1fa632fc511381cc995a6b5612d1 Merge: 524e139 bac64af Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 10:21:48 2016 +0200 Retour sur develop pour intégrer les autres tickets avant release Merge branch 'feature/8242' into develop commit bac64afb829011015fdb66554e1f0ed5a4e3351b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Apr 22 10:21:42 2016 +0200 Fin du ménage même s'il reste encore des choses à revoir... commit c3169952215774d51b261d78c8d3f51b38cd55bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 21 20:38:11 2016 +0200 Utilisation de la requete sur le cache d'échantillon + continue à simplifier et assainir le code commit 5f9e52eb0d50d860afba559748c7fb4c3b1473b6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 21 20:37:34 2016 +0200 Introduction d'une requète sur le cache d'échantillons + amélioration du cache commit 8cd62f9b5921d830b5e8073f97605866e836a403 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 12:01:51 2016 +0200 Amélioration des logs sur le cache commit c74e5c16722a58ead5846549d0a2f1492b6e5d30 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 09:58:56 2016 +0200 Si un des max est atteint on ne propose plus de prélever commit 72ca87d8dcb41cbe7eeddc192bcf2f6710894b0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 09:48:03 2016 +0200 Ne plus conserver les états dans le modèle de zone de notification + renommage propriété commit 41feecb29c66e2f075e3b94d92a45e5b2d6c99f1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 09:46:49 2016 +0200 Ne plus cacher le status dans la zone de notification Summary of changes: ...cesSamplingAlgorithmEntryNotFoundException.java | 6 +- .../service/sampling/CruiseSamplingCache.java | 395 +++++++++------------ .../IndividualObservationSamplingCacheRequest.java | 80 +++++ .../IndividualObservationSamplingStatus.java | 3 +- ...lObservationSamplingStatusExceptionSupport.java | 15 +- ...NotDefinedOnIndividualObservationException.java | 6 +- .../ZoneNotDefinedOnFishingOperationException.java | 6 +- .../IndividualObservationBatchRowModel.java | 21 +- .../IndividualObservationBatchRowState.java | 38 +- .../IndividualObservationBatchTableHandler.java | 375 +++++++++++-------- .../IndividualObservationBatchTableModel.java | 14 +- .../IndividualObservationBatchUIModel.java | 8 + ...dividualObservationToSamplingCacheResolver.java | 147 ++++++++ .../frequency/IndividualObservationUICache.java | 371 ++++++------------- .../frequency/SamplingNotificationZoneHandler.java | 8 +- .../frequency/SamplingNotificationZoneModel.java | 27 +- .../frequency/SpeciesFrequencyRowModel.java | 4 + .../frequency/SpeciesFrequencyTableModel.java | 4 +- .../frequency/SpeciesFrequencyUIHandler.java | 223 +++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 135 +++---- .../actions/ApplySpeciesFrequencyRafaleAction.java | 51 +-- .../actions/CancelEditSpeciesFrequencyAction.java | 15 +- .../frequency/actions/EditSampleCodeAction.java | 52 +-- .../frequency/actions/RemoveObservationAction.java | 8 +- .../actions/ResetSpeciesFrequencyAction.java | 13 +- 25 files changed, 989 insertions(+), 1036 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/IndividualObservationSamplingCacheRequest.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationToSamplingCacheResolver.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch feature/7459 updated (ed81d11 -> aae9b0f)
by codelutin.com scm 21 Apr '16

21 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 ed81d11 affichage du port série écouté dans la barre de statut (refs #7459) new aae9b0f modif de l'icone du pied à coulisse (fixes #7459) 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 aae9b0f00f3e664838e11a9e71b446f6c087285e 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) Summary of changes: .../java/fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 8 ++++---- .../src/main/resources/icons/action-caliper-down.png | Bin 0 -> 426 bytes .../src/main/resources/icons/action-caliper-up.png | Bin 0 -> 436 bytes 3 files changed, 4 insertions(+), 4 deletions(-) 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 1

branch feature/7459 updated (a13af77 -> ed81d11)
by codelutin.com scm 21 Apr '16

21 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 a13af77 ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) new 0241863 lecture des données reçues sur le pied à coulisse (refs #7459) new 4670088 modif de la conif de port série : nombre au lieu de faire une liste des ports dispo (refs #7459) new ed81d11 affichage du port série écouté dans la barre de statut (refs #7459) 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 ed81d117c0eeec51edff67a2ac9c0856816b0f15 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 46700889b43e745daad22cf975cc772900835dee 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 0241863f218e54054e29ad62a9bf6b5acbbf1da9 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) Summary of changes: tutti-caliper/pom.xml | 69 +---------- .../fr/ifremer/tutti/caliper/feed/Caliper.java | 135 --------------------- .../caliper/feed/CaliperConnectionException.java | 24 ++++ .../tutti/caliper/feed/CaliperFeedReader.java | 19 +-- .../record/CaliperFeedReaderMeasureRecord.java | 15 ++- .../record/CaliperFeedReaderRecordFactory.java | 8 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 5 +- .../java/fr/ifremer/tutti/util/SerialPort.java | 12 -- .../i18n/tutti-persistence_en_GB.properties | 1 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 3 +- .../content/actions/ConnectCaliperAction.java | 2 +- 12 files changed, 61 insertions(+), 237 deletions(-) delete mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/Caliper.java delete mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/SerialPort.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/7459 updated (0388a1f -> a13af77)
by codelutin.com scm 20 Apr '16

20 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 0388a1f creation du module pour le pied à coulisse (caliper) (refs #7459) new f70c0d6 implem de la réception des données du pied a coulisse (refs #7459) new 1a3421d ajout de la conf du port série du pied a coulisse (refs #7459) new a13af77 ajout de la connexion au pied à coulisse depuis l'appli (refs #7459) 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 a13af774f70d53a12bd54e84cb3e5c693c5f5417 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 1a3421d787f401b6a68eb636266b49e2ad2f620e 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 f70c0d60d075f60bb84310445973e1be0dec302e 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) Summary of changes: tutti-caliper/pom.xml | 7 + .../fr/ifremer/tutti/caliper/feed/Caliper.java | 135 ++++++++++++++ .../caliper/feed/CaliperConnectionException.java | 12 ++ .../tutti/caliper/feed/CaliperFeedReader.java | 195 +++++++++------------ .../record/CaliperFeedReaderMeasureRecord.java | 14 +- .../record/CaliperFeedReaderRecordFactory.java | 20 +-- .../record/CaliperFeedReaderRecordSupport.java | 1 + .../CaliperFeedReaderStylusMotionRecord.java | 79 --------- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 29 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 32 ++-- .../java/fr/ifremer/tutti/util/SerialPort.java | 12 ++ .../i18n/tutti-persistence_en_GB.properties | 7 + .../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 | 27 +++ .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 3 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jcss | 29 +++ .../tutti/ui/swing/content/MainUIHandler.java | 21 +++ ...ometerAction.java => ConnectCaliperAction.java} | 30 ++-- ...terAction.java => DisconnectCaliperAction.java} | 22 ++- .../swing/content/config/TuttiConfigUIHandler.java | 36 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 95 +++++++++- .../actions/ApplySpeciesFrequencyRafaleAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 18 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 22 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 32 ++-- 27 files changed, 589 insertions(+), 337 deletions(-) create mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/Caliper.java create mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/CaliperConnectionException.java delete mode 100644 tutti-caliper/src/main/java/fr/ifremer/tutti/caliper/feed/record/CaliperFeedReaderStylusMotionRecord.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/util/SerialPort.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/{DisconnectIchtyometerAction.java => ConnectCaliperAction.java} (54%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/{DisconnectIchtyometerAction.java => DisconnectCaliperAction.java} (64%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (7ed9bfc -> 524e139)
by codelutin.com scm 20 Apr '16

20 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 7ed9bfc Livrable #8249 Merge branch 'feature/8249' into develop new 3191b67 Changement du message lors de l'erreur d'un import (See #8247) new 524e139 Livrable #8247 Merge branch 'feature/8247' 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 524e13953d3c2d08af25338cb5a63278c2f915f0 Merge: 7ed9bfc 3191b67 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 09:08:31 2016 +0200 Livrable #8247 Merge branch 'feature/8247' into develop commit 3191b676c4759b4cdb59c1ee617bb9b603cd8260 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 09:08:29 2016 +0200 Changement du message lors de l'erreur d'un import (See #8247) Summary of changes: .../catches/multipost/MultiPostImportService.java | 18 +++++++----------- .../main/resources/i18n/tutti-service_fr_FR.properties | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (4807b51 -> 7ed9bfc)
by codelutin.com scm 20 Apr '16

20 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 4807b51 Livrable #8261 Merge branch 'feature/8261' into develop new f6c2f9d Correction lors de l'import des mensurations en multi-poste (See #8249) new 7ed9bfc Livrable #8249 Merge branch 'feature/8249' 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 7ed9bfcb2602544b813c1b9d5f2b940421f6033b Merge: 4807b51 f6c2f9d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 08:59:26 2016 +0200 Livrable #8249 Merge branch 'feature/8249' into develop commit f6c2f9d605fd488214ea35bd9c28210dde886b70 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 20 08:59:22 2016 +0200 Correction lors de l'import des mensurations en multi-poste (See #8249) Summary of changes: .../ifremer/tutti/service/catches/multipost/MultiPostImportService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2