--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java	Mon Dec 28 11:50:27 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java	Mon Dec 28 16:24:05 2009 +0000
@@ -34,6 +34,9 @@
 
 import de.intevation.gnv.utils.DistanceCalculator;
 import de.intevation.gnv.utils.WKTUtils;
+import de.intevation.gnv.utils.StringUtils;
+
+import de.intevation.artifacts.CallContext;
 
 import org.jfree.chart.ChartTheme;
 
@@ -41,7 +44,6 @@
 import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jts.io.WKTReader;
 
-
 /**
  * @author Tim Englich <tim.englich@intevation.de>
  *
@@ -92,12 +94,13 @@
         Locale       locale,
         String       uuid,
         boolean      linesVisible,
-        boolean      shapesVisible
+        boolean      shapesVisible,
+        CallContext  callContext
     ) {
         Chart chart = null;
         if (CACHE_CHART) {
             log.info("Try to get horizontalprofilemeshcross chart from cache.");
-            chart = (Chart) getChartFromCache(uuid);
+            chart = (Chart) getChartFromCache(uuid, callContext);
         }
 
         if (chart != null)
@@ -127,7 +130,7 @@
     }
 
     @Override
-    protected Object getChartResult(String uuid) {
+    protected Object getChartResult(String uuid, CallContext callContext) {
         log.debug("HorizontalProfileMeshCrossOutputState.getChartResult");
         Collection<Result> result = null;
         if (CacheFactory.getInstance().isInitialized()) {
@@ -227,7 +230,7 @@
 
                 for (int j = 0; j < columns; ++j) {
                     String columnName = rd.getColumnName(j);
-                    if (!blacklisted(columnName)) {
+                    if (!StringUtils.contains(COLUMN_BLACKLIST, columnName)) {
                         resultDescriptor.addColumn(
                             columnName,
                             rd.getColumnClassName(j));
@@ -262,15 +265,6 @@
     }
 
 
-    private static final boolean blacklisted(String column) {
-        for (int i = 0; i < COLUMN_BLACKLIST.length; ++i) {
-            if (COLUMN_BLACKLIST.equals(column)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     private static final String [] DIFF_COLUMS = {
         "GROUP1",
         "GROUP2",
@@ -367,7 +361,7 @@
             int pcolums = pd.getColumnCount();
             for (int i = 0, j = 0; i < pcolums; ++i) {
                 String colname = pd.getColumnName(i);
-                if (blacklisted(colname)) {
+                if (StringUtils.contains(COLUMN_BLACKLIST, colname)) {
                     continue;
                 }
                 if (colname.equals("SHAPE")) {