Mercurial > dive4elements > river
changeset 3563:5063c93dfb8e
S/Q relation: Setup better initial activity for the facets of the S/Q results.
flys-artifacts/trunk@5161 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 30 Jul 2012 11:25:19 +0000 |
| parents | 988ec06c400a |
| children | e01b9d1bc941 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java |
| diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Jul 30 09:08:16 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Jul 30 11:25:19 2012 +0000 @@ -1,3 +1,8 @@ +2012-07-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/states/SQRelation.java: + Setup better initial activity for the facets of the S/Q results. + 2012-07-30 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Mon Jul 30 09:08:16 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/SQRelation.java Mon Jul 30 11:25:19 2012 +0000 @@ -95,18 +95,21 @@ ) { String name = facet.getName(); - if (StringUtils.contains(name, FACET_NAMES[CURVE_INDEX]) + if (StringUtils.contains( + name, FACET_NAMES[CURVE_INDEX]) || StringUtils.contains( - name, FACET_NAMES[OUTLIER_MEASUREMENT_INDEX]) + name, FACET_NAMES[OUTLIER_INDEX]) + || StringUtils.contains( + name, FACET_NAMES[MEASURREMENT_INDEX]) ) { // TODO: Only the last should be active. return Boolean.TRUE; } if (StringUtils.contains( - name, FACET_NAMES[MEASURREMENT_INDEX]) - || StringUtils.contains( - name, FACET_NAMES[OUTLIER_INDEX]) + name, FACET_NAMES[OUTLIER_CURVE_INDEX]) + || StringUtils.contains( + name, FACET_NAMES[OUTLIER_MEASUREMENT_INDEX]) ) { return Boolean.FALSE; } @@ -116,6 +119,7 @@ }); } + public SQRelation() { }