[Tutti-commits] branch feature/8191 updated (c0bdc06 -> 26554ce)

31 Mar 2016

      This is an automated email from the git hooks/post-receive script.

New change to branch feature/8191 in repository tutti.

See https://gitlab.nuiton.org/codelutin/tutti.git

     omits  c0bdc06   ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191)
      adds  379048b   correction de la conversion gramme -> unité de la conf (fixes #8189)
      adds  eacf9aa   Amélioration javadoc
      adds  3051429   Ajout d'une nouvelle méthode de conversion qui semble fonctionner
      adds  563c3b6   Amélioration de la méthode de convertion
      adds  68fe8e2   Merge branch 'feature/8189' into 'develop'
      adds  bfbdf45   suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192)
      adds  dadc607   utilisation d'un objet pour gérer le code de prélèvement (fixes #8192)
      adds  9e9dbf7   livrable #8192 Merge branch 'feature/8192' into develop
      adds  189803c   l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146)
      adds  c03c492   fix merge
      adds  8edb8bd   livrable #8146 Merge branch 'feature/8146' into develop
      adds  ffb26da   ajout des colonnes de code campagne et de nom scientifique (fixes #8164)
      adds  3e74e9f   livrable #8164 Merge branch 'feature/8164' into develop
       new  26554ce   ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191)

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   (c0bdc06)
            \
             N -- N -- N   refs/heads/feature/8191 (26554ce)

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 26554ce215ce03f79648a79f482cfd9f16c91461
Author: Kevin Morin <morin@codelutin.com>
Date:   Thu Mar 31 09:58:44 2016 +0200

    ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191)

Summary of changes:
 .../java/fr/ifremer/tutti/TuttiConfiguration.java  |  4 --
 .../fr/ifremer/tutti/TuttiConfigurationOption.java |  8 ---
 .../java/fr/ifremer/tutti/type/WeightUnit.java     |  6 --
 .../main/java/fr/ifremer/tutti/util/Weights.java   | 72 ++++++++++++++++++----
 .../ifremer/tutti/service/PersistenceService.java  |  4 +-
 .../fr/ifremer/tutti/service/TuttiDataContext.java |  4 +-
 .../protocol/CalcifiedPiecesSamplingRow.java       |  6 ++
 .../protocol/CalcifiedPiecesSamplingRowModel.java  | 29 ++++++++-
 .../CruiseSamplingCache.java                       |  9 ++-
 .../CruiseSamplingCacheLoader.java                 |  2 +-
 .../CruiseSamplingInternalCache.java               |  2 +-
 .../tutti/service/sampling/SamplingCodePrefix.java | 54 ++++++++++++++++
 .../{samplingCache => sampling}/SamplingEvent.java |  2 +-
 .../SamplingListener.java                          |  2 +-
 .../content/actions/EditCatchesSupportAction.java  |  2 +-
 .../swing/content/config/TuttiConfigUIHandler.java |  3 -
 .../IndividualObservationBatchRowModel.java        | 43 ++-----------
 .../IndividualObservationBatchTableModel.java      | 22 +++++--
 .../SampleCodeEditionPopupUI.jaxx                  |  4 +-
 .../SampleCodeEditionPopupUI.jcss                  |  2 +-
 .../SampleCodeEditionPopupUIHandler.java           |  3 +-
 .../SampleCodeEditionPopupUIModel.java             |  7 ++-
 .../SamplingCodeCellEditor.java                    |  4 +-
 .../frequency/IndividualObservationUICache.java    |  6 +-
 .../frequency/SpeciesFrequencyRowModel.java        | 23 ++++++-
 .../frequency/SpeciesFrequencyTableModel.java      | 40 ++++++------
 .../frequency/SpeciesFrequencyUIHandler.java       | 28 ++++++---
 .../species/frequency/SpeciesFrequencyUIModel.java |  7 ++-
 .../frequency/actions/DeleteSampleCodeAction.java  |  2 +-
 .../frequency/actions/EditSampleCodeAction.java    |  6 +-
 30 files changed, 265 insertions(+), 141 deletions(-)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (98%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (99%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (99%)
 create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (98%)
 rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (95%)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

[Tutti-commits] branch feature/8191 updated (c0bdc06 -> 26554ce)

codelutin.com scm