diff gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java @ 439:8975de9d7483

Loop through configuration to chart generation. gnv-artifacts/trunk@487 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 28 Dec 2009 16:24:05 +0000
parents 6a70e8883307
children eb2ac62e853a
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java	Mon Dec 28 11:50:27 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java	Mon Dec 28 16:24:05 2009 +0000
@@ -29,6 +29,8 @@
 import com.vividsolutions.jts.io.ParseException;
 import com.vividsolutions.jts.io.WKTReader;
 
+import de.intevation.artifacts.CallContext;
+
 import de.intevation.gnv.artifacts.cache.CacheFactory;
 
 import de.intevation.gnv.chart.Chart;
@@ -57,6 +59,7 @@
 import de.intevation.gnv.statistics.VerticalProfileStatistics;
 
 import de.intevation.gnv.utils.WKTUtils;
+import de.intevation.gnv.utils.StringUtils;
 
 /**
  * @author Tim Englich <tim.englich@intevation.de>
@@ -93,7 +96,7 @@
 
 
     @Override
-    protected Object getChartResult(String uuid) {
+    protected Object getChartResult(String uuid, CallContext callContext) {
         log.debug("VerticalCrossSectionOutputState.getChartResult");
         Collection<Result> result = null;
         String key = uuid + super.getID();
@@ -192,7 +195,7 @@
                 for (int i = 0; i < columnCount; i++) {
                     String colName = rd.getColumnName(i);
 
-                    if (!attributeInList(colName)) {
+                    if (!StringUtils.contains(ATTRIBUTE_LIST, colName)) {
                         attColumns.setAttribute(
                             colName,
                             result.getObject(colName));
@@ -248,13 +251,14 @@
         Locale       locale,
         String       uuid,
         boolean      linesVisible,
-        boolean      shapesVisible
+        boolean      shapesVisible,
+        CallContext  callContext
     ) {
         Chart chart = null;
 
         if (CACHE_CHART) {
             log.info("Try to get verticalcrosssection chart from cache.");
-            chart = (Chart) getChartFromCache(uuid);
+            chart = (Chart) getChartFromCache(uuid, callContext);
         }
 
         if (chart != null)

http://dive4elements.wald.intevation.org