Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java @ 8331:27d42c9ee367
Main values: Reduce code duplication and correct logic to specify whether we are at gauge or not.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Fri, 26 Sep 2014 09:44:48 +0200 |
| parents | e4606eae8ea5 |
| children | c62837ba37f3 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Sep 26 08:40:20 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Sep 26 09:44:48 2014 +0200 @@ -91,8 +91,6 @@ private static final String [] INACTIVES = new String[] { LONGITUDINAL_Q, DURATION_Q, - HISTORICAL_DISCHARGE_MAINVALUES_W, - HISTORICAL_DISCHARGE_MAINVALUES_Q, STATIC_WQKMS_Q }; @@ -108,9 +106,7 @@ String outputName ) { String fname = facet.getName(); - if ((fname.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) - || fname.equals(COMPUTED_DISCHARGE_MAINVALUES_W) - || fname.equals(MAINVALUES_Q) + if ((fname.equals(MAINVALUES_Q) || fname.equals(MAINVALUES_W)) && outputName.equals("computed_discharge_curve")) {