Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 4183:1755a1bfe5ce
Merged
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Fri, 19 Oct 2012 09:20:52 +0200 |
parents | 1dc658c3306b |
children | 6153c50f78cf |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Tue Oct 16 12:44:15 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Fri Oct 19 09:20:52 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); - } }); }