# HG changeset patch
# User Christian Lins <christian.lins@intevation.de>
# Date 1348475793 0
# Node ID bdf855b5693f0755556ed8050a7bf75ff60ce753
# Parent  5fce1908317ffef488deebe027e21ee064ad6e94
Fixing analysis longitudinal section chart has now initially deactivated A1/B facets

flys-artifacts/trunk@5581 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 5fce1908317f -r bdf855b5693f flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Mon Sep 24 08:25:00 2012 +0000
+++ b/flys-artifacts/ChangeLog	Mon Sep 24 08:36:33 2012 +0000
@@ -1,3 +1,9 @@
+2012-09-24	Christian Lins	<christian.lins@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java:
+	  Fixing analysis longitudinal section chart has now initially
+	  deactivated A1/B facets. W/Q and W(t) has activated facets. (#874)
+
 2012-09-24	Björn Ricks	<bjoern.ricks@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java:
diff -r 5fce1908317f -r bdf855b5693f flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java	Mon Sep 24 08:25:00 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java	Mon Sep 24 08:36:33 2012 +0000
@@ -79,16 +79,18 @@
                     Facet    facet,
                     String   output
                 ) {
-                    String name = facet.getName();
+                    if (output.contains(FacetTypes.ChartType.FLSC.toString())) { // Longitudinal section chart
+                        String name = facet.getName();
 
-                    if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT)
-                     || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS)
-                     || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ)
-                     || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT)
-                     || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS)
-                     || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ)
-                    ) {
-                        return Boolean.FALSE;
+                        if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT)
+                         || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS)
+                         || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ)
+                         || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT)
+                         || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS)
+                         || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ)
+                        ) {
+                            return Boolean.FALSE;
+                        }
                     }
 
                     return Boolean.TRUE;