Changeset 402

Show
Ignore:
Timestamp:
09/25/08 17:56:12 (3 months ago)
Author:
arneke
Message:

How about we don't ignore format strings to the demo pages?

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/geowebcache/src/main/java/org/geowebcache/demo/Demo.java

    r392 r402  
    1414import org.geowebcache.layer.TileLayer; 
    1515import org.geowebcache.layer.TileLayerDispatcher; 
     16import org.geowebcache.mime.MimeType; 
    1617import org.geowebcache.util.wms.BBOX; 
    1718 
    … …  
    159160    throws GeoWebCacheException { 
    160161        String layerName = layer.getName(); 
    161         String mime = layer.getDefaultMimeType().getFormat(); 
     162        //String mime = MimeType.createFromFormat(formatStr).g; 
    162163        //int srsIdx = layer.getSRSIndex(SRS.getSRS(srsStr)); 
    163164         
    … …  
    170171            "<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>\n" 
    171172            +"<meta http-equiv=\"imagetoolbar\" content=\"no\">\n" 
    172             +"<title>"+layerName+" "+srs.toString()+" "+mime+"</tile>\n" 
     173            +"<title>"+layerName+" "+srs.toString()+" "+formatStr+"</tile>\n" 
    173174            +"<style type=\"text/css\">\n" 
    174175            +"body { font-family: sans-serif; font-weight: bold; font-size: .8em; }\n" 
    … …  
    191192            +"var demolayer = new OpenLayers.Layer.WMS(\n" 
    192193            +"\""+layerName+"\",\"../service/wms\",\n" 
    193             +"{layers: '"+layerName+"', format: '"+mime+"'} );\n" 
     194            +"{layers: '"+layerName+"', format: '"+formatStr+"'} );\n" 
    194195            +"map.addLayer(demolayer);\n" 
    195196            +"map.zoomToExtent(new OpenLayers.Bounds("+zoomBounds.toString()+"));\n"