Changeset 362

Timestamp:

09/01/08 19:51:28 (4 months ago)

Author:

arneke

Message:

This probably fixes JSON output for dump of all layers

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/rest/TileLayerResource.java (modified) (3 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/rest/TileLayerResource.java

@@ -76 +76 @@
         super(context, request, response);
         
-        System.out.println(this);
-        
         // Prep
         RESTDispatcher restDispatch = RESTDispatcher.getInstance();
@@ -116 +114 @@
         
         if(currentLayer == null) {
-            //if(variant.getMediaType() == MediaType.APPLICATION_JSON) {
-            //    result = getJSONRepresentationAsListOfLayers();
-            //} else {
+            if(variant.getMediaType() == MediaType.APPLICATION_JSON) {
+                result = getJSONRepresentationAsListOfLayers();
+            } else {
                 result = getDomRepresentationAsListOfLayers();
-            //}
+            }
         } else {
             if(variant.getMediaType() == MediaType.APPLICATION_JSON) {
@@ -169 +167 @@
         return new DomRepresentation(MediaType.TEXT_XML, doc);
     }
+    
+    /**
+     * Returns a JsonRepresentation of all available layers
+     *
+     * @return
+     */
+    private JsonRepresentation getJSONRepresentationAsListOfLayers() {
+        JsonRepresentation rep = null;
+        StringBuffer buf = new StringBuffer();
+
+        buf.append("[");
+        //try {
+            XStream xs = XMLConfiguration.getConfiguredXStream(
+                    new XStream(new JsonHierarchicalStreamDriver()));
+            //JSONObject obj = new JSONObject();
+            
+            boolean first = true;
+            Iterator<Entry<String,TileLayer>> iter = tlDispatcher.getLayers().entrySet().iterator();
+            while(iter.hasNext()) {
+                Entry<String,TileLayer> entry = iter.next();
+                TileLayer layer = entry.getValue();
+                
+                if(first) {
+                    first = false;
+                } else {
+                    buf.append(",\n");
+                }
+                
+                buf.append(xs.toXML(layer));
+            }
+            
+            buf.append("]");
+            
+            rep = new JsonRepresentation(buf.toString());
+        //} catch (JSONException jse) {
+        //    jse.printStackTrace();
+        //}
+        return rep;
+    }
+    
 
     /**