branch develop updated (7415cb5 -> 6de0bdc)
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 7415cb5 Livrable #8228 Merge branch 'feature/8228' into develop new 684e7ba Le sexe peut être null new 0750156 on export les hits seulement si il y a eu des prélèvements (See #8157) new 6de0bdc Livrable #8157 Merge branch 'feature/8157' 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 6de0bdc325c8b65a5ecabbeacc06ae783988fa64 Merge: 7415cb5 0750156 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:06:21 2016 +0200 Livrable #8157 Merge branch 'feature/8157' into develop commit 075015654e732d480a2991c3a4c01824464d30c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:06:17 2016 +0200 on export les hits seulement si il y a eu des prélèvements (See #8157) commit 684e7ba206cdfb3d67c2d0d4d6e52bb59232f9de Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 12:46:08 2016 +0200 Le sexe peut être null Summary of changes: .../service/export/cps/SamplingNumberRowModel.java | 2 +- .../service/sampling/CruiseSamplingInternalCache.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) -- 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 684e7ba206cdfb3d67c2d0d4d6e52bb59232f9de Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 12:46:08 2016 +0200 Le sexe peut être null --- .../fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java index c4601ef..1098dd5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/cps/SamplingNumberRowModel.java @@ -71,7 +71,7 @@ public class SamplingNumberRowModel extends AbstractTuttiImportExportModel<Cache newColumnForExport(t("tutti.service.calcifiedPiecesSamplingReport.header.gender"), CacheExtractedKey.PROPERTY_SEX, new ValueFormatter<CaracteristicQualitativeValue>() { @Override public String format(CaracteristicQualitativeValue value) { - return t(value.getDescription()); + return value == null ? "" : t(value.getDescription()); } }); newColumnForExport(t("tutti.service.calcifiedPiecesSamplingReport.header.samplingNb"), CacheExtractedKey.PROPERTY_SAMPLING_NB, TuttiCsvUtil.PRIMITIVE_INTEGER); -- 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 075015654e732d480a2991c3a4c01824464d30c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:06:17 2016 +0200 on export les hits seulement si il y a eu des prélèvements (See #8157) --- .../service/sampling/CruiseSamplingInternalCache.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java index 1ac750f..371d836 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/CruiseSamplingInternalCache.java @@ -198,7 +198,7 @@ class CruiseSamplingInternalCache implements Closeable { SamplingData samplingData = entry.getValue(); - if (!samplingData.isEmpty()) { + if (samplingData.withSampling()) { String[] keyTokens = entry.getKey().split(KEY_SEPARATOR); @@ -251,7 +251,7 @@ class CruiseSamplingInternalCache implements Closeable { } public int decrementObservationNb() { - Preconditions.checkState(observationNb > 0, "You cannot decrement the observation number if there is no observation"); + Preconditions.checkState(withObservation(), "You cannot decrement the observation number if there is no observation"); observationNb--; return getObservationNb(); } @@ -266,17 +266,21 @@ class CruiseSamplingInternalCache implements Closeable { } public int decrementSamplingNb() { - Preconditions.checkState(samplingNb > 0, "You cannot decrement a sampling number if there is no sampling"); + Preconditions.checkState(withSampling(), "You cannot decrement a sampling number if there is no sampling"); samplingNb--; return getSamplingNb(); } - public int getSamplingNb() { - return samplingNb; + public boolean withSampling() { + return samplingNb > 0; + } + + public boolean withObservation() { + return observationNb > 0; } - public boolean isEmpty() { - return samplingNb == 0 && observationNb == 0; + public int getSamplingNb() { + return samplingNb; } @Override -- 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 develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6de0bdc325c8b65a5ecabbeacc06ae783988fa64 Merge: 7415cb5 0750156 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 13:06:21 2016 +0200 Livrable #8157 Merge branch 'feature/8157' into develop .../service/export/cps/SamplingNumberRowModel.java | 2 +- .../service/sampling/CruiseSamplingInternalCache.java | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm