Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java @ 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 | b195fede1c3b |
children | a3dc382bc1ca |
comparison
equal
deleted
inserted
replaced
4792:8b609ea08128 | 4793:c0d6391bec6f |
---|---|
274 Artifact artifact, | 274 Artifact artifact, |
275 Facet facet, | 275 Facet facet, |
276 String output | 276 String output |
277 ) { | 277 ) { |
278 String name = facet.getName(); | 278 String name = facet.getName(); |
279 if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || | 279 if (name.equals(FLOW_VELOCITY_MAINCHANNEL_FILTERED) || |
280 name.equals(FLOW_VELOCITY_TAU_FILTERED) || | |
281 name.equals(FLOW_VELOCITY_DISCHARGE) || | |
282 name.equals(FLOW_VELOCITY_TOTALCHANNEL_FILTERED)) { | |
283 return Boolean.TRUE; | |
284 } | |
285 else if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || | |
280 name.equals(FLOW_VELOCITY_TAU) || | 286 name.equals(FLOW_VELOCITY_TAU) || |
281 name.equals(FLOW_VELOCITY_TOTALCHANNEL)) { | 287 name.equals(FLOW_VELOCITY_TOTALCHANNEL)) { |
282 return Boolean.FALSE; | 288 return Boolean.FALSE; |
283 } | 289 } |
284 else { | 290 else { |
285 return Boolean.TRUE; | 291 return null; |
286 } | 292 } |
287 } | 293 } |
288 }); | 294 }); |
289 } | 295 } |
290 } | 296 } |