Mercurial > dive4elements > river
changeset 4793:c0d6391bec6f
Fixed facet activities.
Return true for active facets only if the facet name is known.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 09 Jan 2013 13:17:09 +0100 |
| parents | 8b609ea08128 |
| children | a7d080347ac3 |
| files | flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java |
| diffstat | 2 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Wed Jan 09 09:19:32 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Wed Jan 09 13:17:09 2013 +0100 @@ -276,13 +276,19 @@ String output ) { String name = facet.getName(); - if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || + if (name.equals(FLOW_VELOCITY_MAINCHANNEL_FILTERED) || + name.equals(FLOW_VELOCITY_TAU_FILTERED) || + name.equals(FLOW_VELOCITY_DISCHARGE) || + name.equals(FLOW_VELOCITY_TOTALCHANNEL_FILTERED)) { + return Boolean.TRUE; + } + else if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || name.equals(FLOW_VELOCITY_TAU) || name.equals(FLOW_VELOCITY_TOTALCHANNEL)) { return Boolean.FALSE; } else { - return Boolean.TRUE; + return null; } } });
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java Wed Jan 09 09:19:32 2013 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/minfo/DifferencesState.java Wed Jan 09 13:17:09 2013 +0100 @@ -384,8 +384,18 @@ name.equals(BED_DIFFERENCE_YEAR_HEIGHT2)) { return Boolean.FALSE; } + else if (name.equals(BED_DIFFERENCE_MORPH_WIDTH) || + name.equals(BED_DIFFERENCE_EPOCH_FILTERED) || + name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED) || + name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED) || + name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) || + name.equals(BED_DIFFERENCE_YEAR_FILTERED) || + name.equals(BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED) || + name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){ + return Boolean.TRUE; + } else { - return Boolean.TRUE; + return null; } } });