Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java @ 4433:5b8919ef601d
Backed out changeset e8a4d2fd25cc
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 07 Nov 2012 12:23:41 +0100 |
parents | e8a4d2fd25cc |
children | acfd48384835 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Wed Nov 07 09:47:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Wed Nov 07 12:23:41 2012 +0100 @@ -81,7 +81,6 @@ Facet facet, String output ) { - log.debug("Registry:is active? " + output + "/" + facet.getName()); if (output.contains(FacetTypes.ChartType.FLSC.toString())) { // Longitudinal section chart String name = facet.getName(); @@ -92,21 +91,14 @@ || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) - // Wrong palace! Go to AnnotationArtifact. - || name.contains(FacetTypes.LONGITUDINAL_ANNOTATION) ) { return Boolean.FALSE; } } - else if (output.contains(FacetTypes.ChartType.FDWC.toString()) + if (output.contains(FacetTypes.ChartType.FDWC.toString()) && facet.getName().contains(FacetTypes.FIX_SECTOR_AVERAGE_DWT)) { return Boolean.FALSE; } - else if (output.contains(FacetTypes.ChartType.LS.toString()) - && facet.getName().contains(FacetTypes.LONGITUDINAL_ANNOTATION)) { - - return Boolean.FALSE; - } return Boolean.TRUE; }