--- a/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Wed Nov 02 13:41:39 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/MapfileGenerator.java	Wed Nov 02 15:02:23 2011 +0000
@@ -20,7 +20,6 @@
 import de.intevation.artifacts.common.utils.Config;
 
 import de.intevation.flys.artifacts.FLYSArtifact;
-import de.intevation.flys.artifacts.model.DBLayerInfo;
 import de.intevation.flys.artifacts.model.LayerInfo;
 import de.intevation.flys.artifacts.model.WMSLayerFacet;
 import de.intevation.flys.artifacts.model.WMSDBLayerFacet;
@@ -370,12 +369,12 @@
     {
         logger.debug("createUeskLayer");
 
-        LayerInfo layerinfo = new LayerInfo(
-            flys.identifier() + MS_WSPLGEN_POSTFIX,
-            "POLYGON",
-            flys.identifier(),
-            WSPLGEN_RESULT_SHAPE,
-            "I18N_WSPLGEN_RESULT");
+        LayerInfo layerinfo = new LayerInfo();
+        layerinfo.setName(flys.identifier() + MS_WSPLGEN_POSTFIX);
+        layerinfo.setType("POLYGON");
+        layerinfo.setDirectory(flys.identifier());
+        layerinfo.setData(WSPLGEN_RESULT_SHAPE);
+        layerinfo.setTitle("I18N_WSPLGEN_RESULT");
 
         String name = MS_LAYER_PREFIX + wms.getName();
 
@@ -414,23 +413,23 @@
         String group      = uuid + MS_BARRIERS_POSTFIX;
         String groupTitle = "I18N_BARRIERS_TITLE";
 
-        LayerInfo lineInfo = new LayerInfo(
-            uuid + MS_LINE_POSTFIX,
-            "LINE",
-            uuid,
-            WSPLGEN_LINES_SHAPE,
-            "I18N_LINE_SHAPE",
-            group,
-            groupTitle);
+        LayerInfo lineInfo = new LayerInfo();
+        lineInfo.setName(uuid + MS_LINE_POSTFIX);
+        lineInfo.setType("LINE");
+        lineInfo.setDirectory(uuid);
+        lineInfo.setData(WSPLGEN_LINES_SHAPE);
+        lineInfo.setTitle("I18N_LINE_SHAPE");
+        lineInfo.setGroup(group);
+        lineInfo.setGroupTitle(groupTitle);
 
-        LayerInfo polygonInfo = new LayerInfo(
-            uuid + MS_POLYGONS_POSTFIX,
-            "POLYGON",
-            uuid,
-            WSPLGEN_POLYGONS_SHAPE,
-            "I18N_POLYGON_SHAPE",
-            group,
-            groupTitle);
+        LayerInfo polygonInfo = new LayerInfo();
+        polygonInfo.setName(uuid + MS_POLYGONS_POSTFIX);
+        polygonInfo.setType("POLYGON");
+        polygonInfo.setDirectory(uuid);
+        polygonInfo.setData(WSPLGEN_POLYGONS_SHAPE);
+        polygonInfo.setTitle("I18N_POLYGON_SHAPE");
+        polygonInfo.setGroup(group);
+        polygonInfo.setGroupTitle(groupTitle);
 
         String nameLines    = MS_LAYER_PREFIX + wms.getName() + "-lines";
         String namePolygons = MS_LAYER_PREFIX + wms.getName() + "-polygons";
@@ -475,13 +474,14 @@
     {
         logger.debug("createDatabaseLayer");
 
-        LayerInfo layerinfo = new DBLayerInfo(
-            flys.identifier() + "-" + wms.getName(),
-            "LINE",
-            wms.getFilter(),
-            wms.getData(),
-            wms.getDescription());
+        LayerInfo layerinfo = new LayerInfo();
+        layerinfo.setName(flys.identifier() + "-" + wms.getName());
+        layerinfo.setType(wms.getGeometryType());
+        layerinfo.setFilter(wms.getFilter());
+        layerinfo.setData(wms.getData());
+        layerinfo.setTitle(wms.getDescription());
         layerinfo.setStyle(style);
+        layerinfo.setExtent(GeometryUtils.jtsBoundsToOLBounds(wms.getExtent()));
 
         String name = MS_LAYER_PREFIX + wms.getName();