Changeset 346 for trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.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/layer/wms/WMSLayer.java (modified) (8 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java

@@ -56 +56 @@
 public class WMSLayer extends TileLayer {
     // needed in configuration object written to xml
-    private String WMSurl = null;
-
+    
+    private String[] wmsUrl = null;
+
+    private String wmsLayers = null;
+    
+    private String wmsStyles = null;
+    
     private int[] metaWidthHeight = null;
 
@@ -88 +93 @@
     private transient String vendorParameters;
 
-    protected transient String[] wmsURL;
+    //protected transient String[] wmsURL;
 
     private transient int curWmsURL;
@@ -94 +99 @@
     //private transient String wmsLayers;
 
-    private transient String wmsStyles;
+    //private transient String wmsStyles;
 
     //private transient WMSParameters wmsparams;
@@ -138 +143 @@
     
     public WMSLayer(String layerName, CacheFactory cacheFactory,
-            String wmsURL, List<String> mimeFormats,
-            Hashtable<SRS,Grid> grids, int[] metaWidthHeight,
-            String vendorParams) {
+            String[] wmsURL, String wmsLayers, String wmsStyles,
+            List<String> mimeFormats, Hashtable<SRS,Grid> grids, 
+            int[] metaWidthHeight, String vendorParams) {
      
         name = layerName;
         initCacheFactory = cacheFactory;
-        this.WMSurl = wmsURL;
+        this.wmsUrl = wmsURL;
+        this.wmsLayers = wmsLayers;
+        this.wmsStyles = wmsStyles;
         this.mimeFormats = mimeFormats;
         this.grids = grids;
@@ -578 +585 @@
         }
         // wms urls
-        wmsURL = WMSurl.split(",");
+        //wmsUrl = wmsUrl.split(",");
 
         // mimetypes
@@ -668 +675 @@
         wmsparams.setRequest(request);
         wmsparams.setVersion(version);
-        wmsparams.setLayer(this.name);
+        if(this.wmsLayers != null && this.wmsLayers.length() > 0) {
+            wmsparams.setLayer(this.wmsLayers);
+        } else {
+            wmsparams.setLayer(this.name);
+        }
+        
         wmsparams.setErrorMime(errormime);
 
@@ -697 +709 @@
      */
     protected String nextWmsURL() {
-        curWmsURL = (curWmsURL + 1) % wmsURL.length;
-        return wmsURL[curWmsURL];
+        curWmsURL = (curWmsURL + 1) % wmsUrl.length;
+        return wmsUrl[curWmsURL];
     }
 
@@ -919 +931 @@
     }
 
-    public void setWMSurl(String wmsurl) {
-        this.WMSurl = wmsurl;
-    }
-
-    public String getWMSurl() {
-        return this.WMSurl;
+    public void setWMSurl(String[] wmsurl) {
+        this.wmsUrl = wmsurl;
+    }
+
+    public String[] getWMSurl() {
+        return this.wmsUrl;
     }