branch feature/8219 updated (ce022f7 -> 9d0beb9)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8219 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git omits ce022f7 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) adds f56397f lecture de la mesure venant de l'ichtyometre, qu'importe le mode de copie (fixes #8206) adds 4365ccc livrable #8206 Merge branch 'feature/8206' into develop adds ff7f247 l'ui qui permet d'avoir la popup plus large doit etre mise sur la combo à la création, sinon ça a l'air de virer des listeners (fixes #8209) adds 827b53a livrable #8209 Merge branch 'feature/8209' into develop new 9d0beb9 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) 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 (ce022f7) \ N -- N -- N refs/heads/feature/8219 (9d0beb9) 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 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 9d0beb97a5f0f539dcfc347bf53e5a157bc5fdc3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 4 11:58:30 2016 +0200 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) Summary of changes: .../species/frequency/SpeciesFrequencyUI.jaxx | 7 ++-- .../frequency/SpeciesFrequencyUIHandler.java | 6 --- .../actions/ApplySpeciesFrequencyRafaleAction.java | 17 ++++---- .../swing/util/WideDataBeanFilterableComboBox.java | 26 ++++++++++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 48 ++++++++++++++++------ 5 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataBeanFilterableComboBox.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8219 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 9d0beb97a5f0f539dcfc347bf53e5a157bc5fdc3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 4 11:58:30 2016 +0200 on pousse la caracteristique de maturité dans les caracteristiques par defaut pour que la maturité ne soit pas éditable sur un lot maturé (fixes #8219) --- .../IndividualObservationBatchTableModel.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index fb5dc78..3e272c1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -104,7 +104,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab protected Caracteristic lengthstepCaracteristic; - protected Optional<Caracteristic> maturityCaracteristic; + protected Optional<Caracteristic> maturityCaracteristic = Optional.empty(); protected Caracteristic sexCaracteristic; @@ -172,9 +172,15 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab } public void setMaturityCaracteristic(Optional<Caracteristic> maturityCaracteristic) { + if (this.maturityCaracteristic.isPresent()) { + defaultCaracteristicsMap.remove(this.maturityCaracteristic.get()); + } this.maturityCaracteristic = maturityCaracteristic; + if (maturityCaracteristic.isPresent()) { + defaultCaracteristicsMap.put(maturityCaracteristic.get(), null); + } if (rows != null) { - rows.forEach(row -> row.setLengthStepCaracteristic(lengthstepCaracteristic)); + rows.forEach(row -> row.setMaturityCaracteristic(maturityCaracteristic)); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm