changeset 8686:9cbbaedc6cba

(issue1755) Remove redundant conditional checks.
author Tom Gottfried <tom@intevation.de>
date Tue, 14 Apr 2015 17:57:09 +0200
parents 5b755d21c425
children 3912da70736b
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java	Tue Apr 14 17:23:15 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedQualityCalculation.java	Tue Apr 14 17:57:09 2015 +0200
@@ -92,7 +92,7 @@
     protected void addValuesToResult(BedQualityResult result,
                                      BedQualityResultValue[] values) {
         for (BedQualityResultValue value: values) {
-            if (value.isEmpty() || value.isNaN() || !value.isInterpolateable()) {
+            if (!value.isInterpolateable()) {
                 if (value.isDiameterResult()) {
                     addProblem("bedquality.missing.diameter." +
                             value.getType(), value.getName().toUpperCase(),
@@ -103,7 +103,7 @@
                             value.getType(), result.getDateRange().getFrom(),
                             result.getDateRange().getTo());
                 }
-                if (!value.isInterpolateable() && (!value.isEmpty() && !value.isNaN())) {
+                if (!value.isEmpty() && !value.isNaN()) {
                     // we want to keep single point results
                     result.add(value);
                 }

http://dive4elements.wald.intevation.org