[wao] branch develop updated (a633eaf -> 5eba42d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from a633eaf [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5eba42d Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) 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 5eba42de91b7f0d509465d2291f6819de6ee962d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Nov 4 12:03:02 2014 +0100 Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) Summary of changes: .../src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 wao. See http://git.codelutin.com/wao.git commit 5eba42de91b7f0d509465d2291f6819de6ee962d Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Nov 4 12:03:02 2014 +0100 Lors du calcul d'un effort, on ne doit pas afficher "-" parce que le numérateur vaut 0 mais bien 0 (fixes #6048) --- .../src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java index ba16478..809bb86 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java @@ -161,7 +161,7 @@ public abstract class SamplingPlan implements Iterable<SamplingPlan.SamplingPlan public String getRealPercentage() { String percentage = PERCENTAGE_UNAVAILABLE; - if (expected != null && expected > 0 && real != null && real > 0) { + if (expected != null && expected > 0 && real != null) { double ratio = ((double) real / expected); percentage = NumberFormat.getPercentInstance().format(ratio); } @@ -170,7 +170,7 @@ public abstract class SamplingPlan implements Iterable<SamplingPlan.SamplingPlan public String getEstimatedPercentage() { String percentage = PERCENTAGE_UNAVAILABLE; - if (expected != null && expected > 0 && estimated != null && real > 0) { + if (expected != null && expected > 0 && estimated != null) { double ratio = ((double) estimated / expected); percentage = NumberFormat.getPercentInstance().format(ratio); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm