Changeset 346 for trunk/geowebcache/src/main/java/org/geowebcache/util/GetCapabilitiesConfiguration.java

Timestamp:

08/22/08 19:27:36 (5 months ago)

Author:

arneke

Message:

Removing old cruft, started reenabling old fields on layer object

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/util/GetCapabilitiesConfiguration.java (modified) (5 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/util/GetCapabilitiesConfiguration.java

@@ -146 +146 @@
             Layer layer = layerIter.next();
             String name = layer.getName();
+            String stylesStr = "";
             
             if (name != null) {
                 List styles = layer.getStyles();
-                String stylesStr = "";
+                
                 StringBuffer buf = new StringBuffer();
                 if(styles != null) {
@@ -161 +162 @@
                         hasOne = true;
                     }
-                }    
-                //TODO styles are not currently forwarded
+                    stylesStr = buf.toString();
+                }
                 
                 double minX = layer.getLatLonBoundingBox().getMinX();
@@ -180 +181 @@
                         latToSphericalMercatorY(maxY));
                
+                String[] wmsUrls = {wmsUrl};
+                
                 WMSLayer wmsLayer = null;
                 try {
-                    wmsLayer = getLayer(name, wmsUrl, bounds4326, 
+                    wmsLayer = getLayer(name, wmsUrls, bounds4326, 
                             bounds900913, stylesStr);
                 } catch (GeoWebCacheException gwc) {
@@ -198 +201 @@
     }
 
-    private WMSLayer getLayer(String name, String wmsurl, 
+    private WMSLayer getLayer(String name, String[] wmsurl, 
             BBOX bounds4326, BBOX bounds900913, String stylesStr)
             throws GeoWebCacheException {
@@ -230 +233 @@
         // TODO We're dropping the styles now...
         return new WMSLayer(name, this.cacheFactory,
-                wmsurl, mimeFormats, grids, metaWidthHeight, this.vendorParameters);
+                wmsurl, stylesStr, name, mimeFormats, grids, 
+                metaWidthHeight, this.vendorParameters);
     }