Changeset 388 for trunk/geowebcache/src/main/java/org/geowebcache/layer/Grid.java

Timestamp:

09/05/08 02:30:42 (4 months ago)

Author:

arneke

Message:

Hooking zoomStart and zoomStop up to grid object instead of layer. More robust at looking for geowebcache.xml

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/layer/Grid.java (modified) (4 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/layer/Grid.java

@@ -21 +21 @@
 import org.geowebcache.GeoWebCacheException;
 import org.geowebcache.util.wms.BBOX;
+import org.mortbay.log.Log;
 
 /**
@@ -37 +38 @@
     private volatile transient GridCalculator gridCalculator;
     
-    private volatile int zoomStart = 0;
+    private int zoomStart = 0;
     
-    private volatile int zoomStop = 30;
+    private int zoomStop = 30;
     
     public Grid(SRS srs, BBOX bounds, BBOX gridBounds, double[] resolutions) {
@@ -122 +123 @@
     }
     
+    /** 
+     * Use double locking to get the calculator to avoid performance hit.
+     * 
+     * @return
+     * @throws GeoWebCacheException
+     */
     public GridCalculator getGridCalculator() throws GeoWebCacheException {
         GridCalculator ret = gridCalculator;
@@ -136 +143 @@
 
     private GridCalculator initGridCalculator() throws GeoWebCacheException {
+        if(zoomStart < 0 || zoomStop < zoomStart || zoomStop == 0) {
+            Log.debug("Missing values, setting zoomStart,zoomStop to 0,30");
+            zoomStart = 0;
+            zoomStop = 30;
+        }
         return new GridCalculator(this);
     }