Mercurial > dive4elements > river
changeset 4181:e1f81795401f
Let MAINVALUES enter life in inactive state in WINFOArtifact.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 18 Oct 2012 20:14:48 +0200 |
| parents | aca2358c88eb |
| children | 79878efbdf07 6b0683f5c530 |
| files | flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Thu Oct 18 20:12:45 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Thu Oct 18 20:14:48 2012 +0200 @@ -96,12 +96,14 @@ ) { String fname = facet.getName(); if ((fname.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) - || fname.equals(COMPUTED_DISCHARGE_MAINVALUES_W)) - && outputName.equals("computed_discharge_curve")) { + || fname.equals(COMPUTED_DISCHARGE_MAINVALUES_W) + || fname.equals(MAINVALUES_Q) + || fname.equals(MAINVALUES_W)) + && outputName.equals("computed_discharge_curve")) + { return Boolean.FALSE; } return !StringUtils.contains(fname, INACTIVES); - } }); }