/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 3483

trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/utils/CapabilitiesTags.java
87	87	public final static String DIMENSION_NAME ="name";
88	88	public final static String DIMENSION_UNITS ="units";
89	89	public final static String DIMENSION_DEFAULT ="default";
	90	public static final String WCS_CONTENTMETADATA = "ContentMetadata";
	91	public static final String WCS_LABEL = "label";
	92	public static final String WCS_KEYWORDS = "keywords";
90	93	}

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /**
+     *
      */
     package org.gvsig.remoteClient.utils;
     /**
      * @author jaume
+     *
      */
     public class DescribeCoverageTags {
         public static final String COVERAGE_DESCRIPTION = "CoverageDesription";
         public static final String COVERAGE_OFFERING = "CoverageOffering";
         public static final String NAME = "name";
         public static final String LABEL = "label";
         public static final String LONLAT_ENVELOPE = "lonLatEnvelope";
+    }

     package org.gvsig.remoteClient.utils;
     import java.awt.geom.Rectangle2D;
     /**
      * <p></p>
+     *
      */
     public class BoundaryBox {
     /**
      * <p>Represents ...</p>
+     *

+     *
      */
     public abstract class WMSLayer implements org.gvsig.remoteClient.ILayer {
     	protected ArrayList children;
     	protected WMSLayer1_1_1 parent;
     /**
      * <p>Layer Abstract field in the capabilities document </p>
      */
         protected ArrayList children;
         protected WMSLayer1_1_1 parent;
         /**
          * <p>Layer Abstract field in the capabilities document </p>
          */
         private String layerAbstract;
     /**
      * <p>Themes provided by the WMS for the layer</p>
      */
         /**
          * <p>Themes provided by the WMS for the layer</p>
          */
         public Hashtable styles = new Hashtable();
     /**
      * <p>Layer name</p>
      */
         /**
          * <p>Layer name</p>
          */
         private String name;
     /**
      * <p>Layer title</p>
      */
         /**
          * <p>Layer title</p>
          */
         private String title;
     /**
      * <p>Layer srs.</p>
      */
         /**
          * <p>Layer srs.</p>
          */
         private Vector srs = new Vector();
     /**
      * <p>extents for each srs the layer can be reproyected to</p>
      */
         /**
          * <p>extents for each srs the layer can be reproyected to</p>
          */
         private Hashtable bBoxes = new Hashtable();
     /**
      * <p>extents that defines the bbox for the LatLon projection
      * It can be included in the bBoxes vector as well, because it is the most used, we keep it separeted too, according
      *  with the OGC WMSCapabilities specifications...
      */
         /**
          * <p>extents that defines the bbox for the LatLon projection
          * It can be included in the bBoxes vector as well, because it is the most used, we keep it separeted too, according
          *  with the OGC WMSCapabilities specifications...
          */
         private org.gvsig.remoteClient.utils.BoundaryBox latLonBbox;
     /**
      * <p>min scale for the layer to be visible</p>
      */
         /**
          * <p>min scale for the layer to be visible</p>
          */
         private double scaleMin;
     /**
      * <p>max scale for the layer to be visible</p>
      */
         /**
          * <p>max scale for the layer to be visible</p>
          */
         private double scaleMax;
     /**
      * <p>Dimensions defined for the layer in the capabilities doc</p>
      */
         /**
          * <p>Dimensions defined for the layer in the capabilities doc</p>
          */
         private java.util.Hashtable dimensions = new Hashtable();
         /**
          * <p>NamedStyles defined for this layer in the capabilities document</p>
          */
         private ArrayList namedStyles = new ArrayList();
         /**
          * Tells if this layer accepts getFeatureInfo requests.
          */
         private boolean queryable;
         /**
-...
          * loading the data in memory to be easily accesed</p>
+         *
          */
             public abstract void parse(KXmlParser parser, TreeMap layerTreeMap )
             throws IOException, XmlPullParserException;
             public void setQueryable(boolean isQueryable)
+            {
             	queryable = isQueryable;
+            }
             public boolean isQueryable()
+            {
             	return queryable;
+            }
     /**
      * <p>Adds a style to the styles vector</p>
      * @param _style
      */
         public abstract void parse(KXmlParser parser, TreeMap layerTreeMap)
         throws IOException, XmlPullParserException;
         /**
          * <p>Adds a style to the styles vector</p>
          * @param _style
          */
         public void addStyle(org.gvsig.remoteClient.wms.WMSStyle _style) {
             styles.put( _style.getName(), _style );
+        }
     /**
      * <p>returns the style with that name in the styles vector</p>
      * @param _name
      */
         /**
          * <p>returns the style with that name in the styles vector</p>
          * @param _name
          */
         public WMSStyle getStyle(String _name) {
             return (WMSStyle)styles.get(_name);
+        }
     /**
      * <p>Gets the style vector</p>
      * @return
      */
         /**
          * <p>Gets the style vector</p>
          * @return
          */
         public Hashtable getStyles() {
             return styles;
+        }
         /**
          * <p>Adds a bbox to the Bboxes vector</p>
          * @param bbox
          */
             public void addBBox(BoundaryBox bbox) {
                 bBoxes.put(bbox.getSrs(), bbox);
+            }
         public void addBBox(BoundaryBox bbox) {
             bBoxes.put(bbox.getSrs(), bbox);
+        }
         /**
          * <p>returns the bbox with that id in the Bboxes vector</p>
          * @param id
          */
             public BoundaryBox getBbox(String id) {
             	return (BoundaryBox)bBoxes.get(id);
+            }
         public BoundaryBox getBbox(String id) {
             return (BoundaryBox)bBoxes.get(id);
+        }
         /**
          * <p>Gets the bBoxes vector</p>
          * @return
          */
             public Hashtable getBboxes() {
                 return bBoxes;
+            }
         public Hashtable getBboxes() {
             return bBoxes;
+        }
         //Methods to manipulate the box that defines the layer extent in LatLon SRS.
        public BoundaryBox getLatLonBox()
+       {
     	   return latLonBbox;
+       }
        public void setLatLonBox(BoundaryBox box)
+       {
     	   latLonBbox = box;
+       }
         public BoundaryBox getLatLonBox()
+        {
             return latLonBbox;
+        }
         public void setLatLonBox(BoundaryBox box)
+        {
             latLonBbox = box;
+        }
         /**
          * <p>adds a new srs to the srs vector</p>
          */
         public void addSrs(String srs)
+        {
         	this.srs.add(srs);
             this.srs.add(srs);
+        }
         public Vector getAllSrs()
+        {
         	return (Vector)this.srs.clone();
             return (Vector)this.srs.clone();
+        }
     /**
      * <p>gets the maximum scale for this layer</p>
      * @return
      */
         /**
          * <p>gets the maximum scale for this layer</p>
          * @return
          */
         public double getScaleMax() {
             return scaleMax;
+        }
     /**
      * <p>gets the minimum scale for this layer</p>
      * @return
      */
         /**
          * <p>gets the minimum scale for this layer</p>
          * @return
          */
         public double getScaleMin() {
             return scaleMin;
+        }
     /**
      * <p>sets the minimum scale for this layer to be visible.</p>
+     *
      * @param scale
      */
         /**
          * <p>sets the minimum scale for this layer to be visible.</p>
+         *
          * @param scale
          */
         public void setScaleMin(double scale) {
             scaleMin = scale;
+        }
     /**
      * <p>sets the maximum scale for this layer to be visible</p>
      * @param scale
      */
         /**
          * <p>sets the maximum scale for this layer to be visible</p>
          * @param scale
          */
         public void setScaleMax(double scale) {
             scaleMax = scale;
+        }
     /**
      * <p> gets the dimension vector defined in this layer</p>
      * @return
      */
         /**
          * <p> gets the dimension vector defined in this layer</p>
          * @return
          */
         public Hashtable getDimensions() {
             return dimensions;
+        }
     /**
      * <p>Sets the dimension vector defined for this layer</p>
      * @param v
      */
         /**
          * <p>Sets the dimension vector defined for this layer</p>
          * @param v
          */
         public void setDimensions(Hashtable v) {
             dimensions = (Hashtable)v.clone();
+        }
     /**
      * <p>Adds a dimension to the dimension vector </p>
      * @param dimension
      */
         /**
          * <p>Adds a dimension to the dimension vector </p>
          * @param dimension
          */
         public void addDimension(org.gvsig.remoteClient.wms.Dimension dimension) {
             dimensions.put(dimension.getName(), dimension);
+        }
     /**
      * <p>Gets layer name</p>
      * @return
      */
         /**
          * <p>Gets layer name</p>
          * @return
          */
         public String getName() {
             return this.name;
+        }
     /**
      * <p>Sets layer name</p>
      * @param _name
      */
         /**
          * <p>Sets layer name</p>
          * @param _name
          */
         public void setName(String name) {
             this.name = name;
+        }
     /**
      * <p>Gets layer title</p>
      * @return
      */
         /**
          * <p>Gets layer title</p>
          * @return
          */
         public String getTitle() {
             return title;
+        }
     /**
      * <p>Sets the layer title</p>
      * @param _title
      */
         /**
          * <p>Sets the layer title</p>
          * @param _title
          */
         public void setTitle(String title) {
             this.title = title;
+        }
     /**
      * <p>Gets the layer abstract</p>
      * @return
      */
         /**
          * <p>Gets the layer abstract</p>
          * @return
          */
         public String getAbstract() {
             return layerAbstract;
+        }
     /**
      * <p>Sets the layer abstract</p>
      * @param m_abstract
      */
         /**
          * <p>Sets the layer abstract</p>
          * @param m_abstract
          */
         public void setAbstract(String _abstract) {
             layerAbstract = _abstract;
+        }
         public ArrayList getChildren() {
         	return children;
             return children;
+        }
         public void setChildren(ArrayList children) {
         	this.children = children;
             this.children = children;
+        }
         public WMSLayer1_1_1 getParent() {
         	return parent;
             return parent;
+        }
         public void setParent(WMSLayer1_1_1 parent) {
         	this.parent = parent;
             this.parent = parent;
+        }
         public String toString(){
         	return this.getTitle();
             return this.getTitle();
+        }
         /**
          * Adds a new named style to the named styles list of this layer.
+         *
          * @param namedStyle the new named style to be added.
          */
         public void addNamedStyle(String namedStyle) {
             String[] stylesArray = namedStyle.split(" ");
             for (int i = 0; i < stylesArray.length; i++){
                 this.namedStyles.add(stylesArray[i]);
+            }
+        }
         /**
          * Gets the list of named styles of this layer
+         *
          * @return ArrayList containing those styles
          */
         public ArrayList getNamedStyles() {
             ArrayList ret = new ArrayList();
             ret.addAll(namedStyles);
             if (parent != null) {
                 ret.addAll(parent.getNamedStyles());
+            }
             return ret;
+        }
         /**
          * Tells if this layer accepts getFeatureInfo requests.
          */
         public boolean isQueryable() {
             return queryable;
+        }
         /**
          * @param queryable The queryable to set.
          */
         public void setQueryable(boolean queryable) {
             this.queryable = queryable;
+        }
+    }

     import java.awt.geom.Rectangle2D;
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.exceptions.WMSException;
     import org.gvsig.remoteClient.utils.BoundaryBox;
     import org.gvsig.remoteClient.wms.wms_1_1_1.WMSProtocolHandler1_1_1;
-...
+     *
      */
     public class WMSClient extends org.gvsig.remoteClient.RasterClient {
         private org.gvsig.remoteClient.wms.WMSProtocolHandler handler;
         private TreeMap layers = new TreeMap();
         private WMSLayer rootLayer;
         /**
          * @return Returns the rootLayer.
          */
         public WMSLayer getRootLayer() {
             return rootLayer;
+        }
         /**
          * @param rootLayer The rootLayer to set.
          */
         public void setRootLayer(WMSLayer rootLayer) {
             this.rootLayer = rootLayer;
+        }
         /**
          * Constructor.
          * the parameter host, indicates the WMS host to connect.
          * */
     	public WMSClient(String host)
+    	{
     		//m_log = LogManager.getLogManager().getLogger(getClass().getName());
     		setHost(host);
     		try
+    		{
     			//TODO: implement a correct negotiation algorithm
     			//handler = WMSProtocolHandlerFactory.negotiate(new URL(host));
     			handler = new WMSProtocolHandler1_1_1();
     			handler.setHost(host);
+    		}
     		catch(Exception e)
+    		{
     			e.printStackTrace();
+    		}
+    	}
     	public String getVersion()
+    	{
     		return handler.getVersion();
+    	}
     /**
      * <p>One of the three interfaces that OGC WMS defines. Request a map.</p>
      */
         public WMSClient(String host)
+        {
             //m_log = LogManager.getLogManager().getLogger(getClass().getName());
             setHost(host);
             /*
               The negotiation is performed in the connect method.
              try
+            {
                 //TODO: implement a correct negotiation algorithm
                 //handler = WMSProtocolHandlerFactory.negotiate(new URL(host));
                 handler = new WMSProtocolHandler1_1_1();
                 handler.setHost(host);
+            }
             catch(Exception e)
+            {
                 e.printStackTrace();
+            }
             */
             handler = new WMSProtocolHandler1_1_1();
             handler.setHost(host);
+        }
         public String getVersion()
+        {
             return handler.getVersion();
+        }
         /**
          * <p>One of the three interfaces that OGC WMS defines. Request a map.</p>
          */
         public byte[] getMap(WMSStatus status) throws WMSException{
             return handler.getMap(status);
+        }
     /**
      * <p>One of the three interfaces defined by OGC WMS, it gets the service capabilities</p>
+     *
      */
         /**
          * <p>One of the three interfaces defined by OGC WMS, it gets the service capabilities</p>
+         *
          */
         public void getCapabilities() {
             handler.getCapabilities();
             layers = handler.layers;
             rootLayer = handler.rootLayer;
+        }
     /**
      * <p>One of the three interfaces defined by the OGC WMS, it gets the information about a feature requested</p>
      * @return
      */
         /**
          * <p>One of the three interfaces defined by the OGC WMS, it gets the information about a feature requested</p>
          * @return
          */
         public String getFeatureInfo(WMSStatus status, int x, int y, int featureCount) throws WMSException{
             return handler.getFeatureInfo(status, x, y, featureCount);
+        }
     /**
      * <p> Reads from the WMS Capabilities, the layers available in the service</p>
      * @return a TreeMap with the available layers in the WMS
      */
         /**
          * <p> Reads from the WMS Capabilities, the layers available in the service</p>
          * @return a TreeMap with the available layers in the WMS
          */
         public TreeMap getLayers() {
             return layers;
+        }
     /**
      * <p>Reads from the WMS Capabilities the number if layers available in the service</p>
      * @return, number of layers available
      */
         /**
          * <p>Reads from the WMS Capabilities the number if layers available in the service</p>
          * @return, number of layers available
          */
         public int getNumberOfLayers() {
         	if (layers != null)
+        	{
         		return layers.size();
+        	}
         	else
+        	{
         		return 0;
+        	}
             if (layers != null)
+            {
                 return layers.size();
+            }
             return 0;
+        }
     /**
      * <p>Gets the WMSLayer with this name</p>
+     *
      * @param _name, layer name
      * @return the layer with this name
      */
         /**
          * <p>Gets the WMSLayer with this name</p>
+         *
          * @param _name, layer name
          * @return the layer with this name
          */
         public WMSLayer getLayer(String _name) {
           	if (layers.get(_name) != null)
+          	{
               return (WMSLayer)layers.get(_name);
+          	}
             if (layers.get(_name) != null)
+            {
                 return (WMSLayer)layers.get(_name);
+            }
             return null;
+        }
         public String[] getLayerNames()
+        {
         	WMSLayer[] lyrs;
         	lyrs = (WMSLayer[])layers.values().toArray(new WMSLayer[0]);
         	String[] names = new String[lyrs.length];
         	for(int i = 0; i<lyrs.length; i++)
+        	{
         		names[i] = ((WMSLayer)lyrs[i]).getName();
+        	}
         	return names;
             WMSLayer[] lyrs;
             lyrs = (WMSLayer[])layers.values().toArray(new WMSLayer[0]);
             String[] names = new String[lyrs.length];
             for(int i = 0; i<lyrs.length; i++)
+            {
                 names[i] = ((WMSLayer)lyrs[i]).getName();
+            }
             return names;
+        }
     //    /**
     //     * Adds a Layer object to the vector of layers of this LayerSet
     //     */
     //    public void addLayer(WMSLayer layer)
     //    {
     //      String layerName = layer.getName();
     //
     //      if (layerName == null)
     //      {
     //        throw new RuntimeException("Error: attempt to add a nameless layer");
     //      }
     //
     //      // We use the lower case version of the name as a key for the hash map.
     //      layerName = layerName.toLowerCase();
     //      if (layers == null)
     //      {
     //      	layers = new TreeMap();
     //      }
     //      layers.put(layerName, layer);
     //    }
     //  /**
     //  * Adds a Layer object to the vector of layers of this LayerSet
     //  */
     //  public void addLayer(WMSLayer layer)
     //  {
     //  String layerName = layer.getName();
     //
     //  if (layerName == null)
     //  {
     //  throw new RuntimeException("Error: attempt to add a nameless layer");
     //  }
     //
     //  // We use the lower case version of the name as a key for the hash map.
     //  layerName = layerName.toLowerCase();
     //  if (layers == null)
     //  {
     //  layers = new TreeMap();
     //  }
     //  layers.put(layerName, layer);
     //  }
     /**
      * <p>Gets the image formats available in the Service to retrieve the maps</p>
      * @return a vector with all the available formats
      */
         /**
          * <p>Gets the image formats available in the Service to retrieve the maps</p>
          * @return a vector with all the available formats
          */
         public Vector getFormats() {
             return handler.getServiceInformation().formats;
+        }
     /**
      * <p>Gets the SRS availables in the Service, all the SRS the Service can reproject to.</p>
      * @return vector with all the available SRS.
      */
         /**
          * <p>Gets the SRS availables in the Service, all the SRS the Service can reproject to.</p>
          * @return vector with all the available SRS.
          */
         public Vector getSrs() {
            return handler.srs;
             return handler.srs;
+        }
         public void close() {
             // your code here
+        }
     /**
      * Returns the max extent that envolves the requested layers
      * */
     public Rectangle2D getLayersExtent(String[]layerNames, String srs)
+    {
     	try
+    	{
     		BoundaryBox bbox;
     		WMSLayer layer = getLayer(layerNames[0]);
     		bbox = layer.getBbox(srs);
     		double xmin = bbox.getXmin();
     		double xmax = bbox.getXmax();
     		double ymin = bbox.getYmin();
     		double ymax = bbox.getYmax();
     		for(int i=1; i<layerNames.length; i++)
+    		{
     			layer = getLayer(layerNames[i]);
     			bbox = layer.getBbox(srs);
     			if (bbox.getXmin() < xmin)
+    			{
     				xmin = bbox.getXmin();
+    			}
     			if (bbox.getYmin() < ymin)
+    			{
     				ymin = bbox.getYmin();
+    			}
     			if (bbox.getXmax() > xmax)
+    			{
     				xmax = bbox.getXmax();
+    			}
     			if (bbox.getYmax() > ymax)
+    			{
     				ymax = bbox.getYmax();
+    			}
+    		}
     		Rectangle2D extent = new Rectangle2D.Double(xmin,ymin,Math.abs(xmax-xmin),Math.abs(ymax-ymin));
     		return extent;
+    	}
     	catch(Exception e)
+    	{
     		//TODO:
     		//Implement logic to handle all the exceptions
     		return null;
+    	}
+    }
     /**
      * Gets the Service information included in the Capabilities
      * */
     public WMSProtocolHandler.ServiceInformation getServiceInformation()
+    {
     	return handler.getServiceInformation();
+    }
     /**
      * <p>Checks the connection to de remote WMS and requests its capabilities.</p>
+     *
      */
         /**
          * Returns the max extent that envolves the requested layers
          * */
         public Rectangle2D getLayersExtent(String[]layerNames, String srs)
+        {
             try
+            {
                 BoundaryBox bbox;
                 WMSLayer layer = getLayer(layerNames[0]);
                 bbox = layer.getBbox(srs);
                 double xmin = bbox.getXmin();
                 double xmax = bbox.getXmax();
                 double ymin = bbox.getYmin();
                 double ymax = bbox.getYmax();
                 for(int i=1; i<layerNames.length; i++)
+                {
                     layer = getLayer(layerNames[i]);
                     bbox = layer.getBbox(srs);
                     if (bbox.getXmin() < xmin)
+                    {
                         xmin = bbox.getXmin();
+                    }
                     if (bbox.getYmin() < ymin)
+                    {
                         ymin = bbox.getYmin();
+                    }
                     if (bbox.getXmax() > xmax)
+                    {
                         xmax = bbox.getXmax();
+                    }
                     if (bbox.getYmax() > ymax)
+                    {
                         ymax = bbox.getYmax();
+                    }
+                }
                 Rectangle2D extent = new Rectangle2D.Double(xmin,ymin,Math.abs(xmax-xmin),Math.abs(ymax-ymin));
                 return extent;
+            }
             catch(Exception e)
+            {
                 e.printStackTrace();
                 return null;
+            }
+        }
         /**
          * Gets the Service information included in the Capabilities
          * */
         public WMSProtocolHandler.ServiceInformation getServiceInformation()
+        {
             return handler.getServiceInformation();
+        }
         /**
          * <p>Checks the connection to de remote WMS and requests its capabilities.</p>
+         *
          */
         public boolean connect()
+    	{
     		try {
     			getCapabilities();
     			if (handler == null)
+    			{
     				if (getHost().trim().length() > 0)
+    				{
     					//TODO: Implement correctly the negotiate algorithm
     					//handler = WMSProtocolHandlerFactory.negotiate(new URL(getHost()));
     					handler = new WMSProtocolHandler1_1_1();
     					handler.setHost(getHost());
+    				}
     				else
+    				{
     					//must to specify host first!!!!
     					return false;
+    				}
+    			}
     			return true;
     		} catch (Exception e) {
     			e.printStackTrace();
     			return false;
+    		}
+    	}
+        {
             try {
                 getCapabilities();
                 if (handler == null)
+                {
                     if (getHost().trim().length() > 0)
+                    {
                         //TODO: Implement correctly the negotiate algorithm
                         //handler = WMSProtocolHandlerFactory.negotiate(new URL(getHost()));
                         handler = new WMSProtocolHandler1_1_1();
                         handler.setHost(getHost());
+                    }
                     else
+                    {
                         //must to specify host first!!!!
                         return false;
+                    }
+                }
                 return true;
             } catch (Exception e) {
                 e.printStackTrace();
                 return false;
+            }
+        }
         //TODO Check this out: Always 1 layer at first level...
         public WMSLayer getLayersRoot() {
         	return (WMSLayer)layers.values().toArray()[0];
             return rootLayer;
+        }
+    }

      */
     public abstract class WMSProtocolHandler {
     	// procotol handler name
     	/**
     	 * procotol handler name
     	 */
         protected String name;
         // protocol handler version
         /**
          * protocol handler version
          */
         protected String version;
         //host of the WMS to conenct
         /**
          * host of the WMS to connect
          */
         protected String host;
         // port number of the comunication channel of the WMS to connect
         /**
          *  port number of the comunication channel of the WMS to connect
          */
         protected String port;
         //WMS metadata
         /**
          * WMS metadata
          */
         protected ServiceInformation serviceInfo;
         public TreeMap layers;
         public WMSLayer rootLayer;
         public Vector srs;
-...
     	    	int readed = 0;
     	    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
                     // Creates a new buffer to contain the previous readed bytes and the next bunch of bytes
     	    		byte[] buffered = new byte[readed+i];
     	    		for (int j = 0; j < buffered.length; j++) {
     	    			if (j<readed){
                             // puts the previously downloaded bytes into the image buffer
     	    				buffered[j] = imageBytes[j];
+    	    			}
     	    			else {
                             // appends the recently downloaded bytes to the image buffer.
     	    				buffered[j] = buffer[j-readed];
+    	    			}
+    				}
-...
+        	}
         	catch(Exception e)
+        	{
         		//TODO
         		//Implement the correct logic to handle all the exceptions.
         		return null;
         		e.printStackTrace();
                 return null;
+        	}
+        }

+     *
      */
     public class WMSLayer1_1_1 extends org.gvsig.remoteClient.wms.WMSLayer {
     	public WMSLayer1_1_1()
+    	{
     		children = new ArrayList();
+    	}
     /**
      * <p>Parses the contents of the parser(WMSCapabilities)
      * to extract the information about an WMSLayer</p>
+     *
      */
        public void parse(KXmlParser parser, TreeMap layerTreeMap)
        throws IOException, XmlPullParserException
         public WMSLayer1_1_1()
+        {
         	int currentTag;
         	boolean end = false;
         	String value;
         	BoundaryBox bbox;
         	parser.require(KXmlParser.START_TAG, null, CapabilitiesTags.LAYER);
         	//First of all set whether the layer is Queryable reading the attribute.
         	value = parser.getAttributeValue("", CapabilitiesTags.QUERYABLE);
         	if (value != null)
+        	{
         		if (value.compareTo("0")==0)
         			setQueryable(false);
         		else
         			setQueryable(true);
+        	}
         	currentTag = parser.nextTag();
         	while (!end)
+        	{
     			 switch(currentTag)
+    			 {
     				case KXmlParser.START_TAG:
     					if (parser.getName().compareTo(CapabilitiesTags.LAYER)==0)
+    					{
     						WMSLayer1_1_1 lyr = new WMSLayer1_1_1();
     						//parser.next();
     						lyr.parse(parser, layerTreeMap);
     						lyr.setParent(this);
     						getChildren().add(lyr);
     						layerTreeMap.put(lyr.getName(), lyr);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.NAME)==0)
+    					{
     						value = parser.nextText();
     						if (value != null) setName(value);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.TITLE)==0)
+    					{
     						value = parser.nextText();
     						if (value != null) setTitle(value);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.ABSTRACT)==0)
+    					{
     						value = parser.nextText();
     						if (value != null) setAbstract(value);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.SRS)==0)
+    					{
     						value = parser.nextText();
     						if (value != null) addSrs(value);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.BOUNDINGBOX)==0)
+    					{
     						bbox = new BoundaryBox();
     						value = parser.getAttributeValue("",CapabilitiesTags.SRS);
     						if (value != null)
     							bbox.setSrs(value);
     						value = parser.getAttributeValue("",CapabilitiesTags.MINX);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setXmin(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MINY);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setYmin(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MAXX);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setXmax(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MAXY);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setYmax(Double.parseDouble(value));
     						addBBox(bbox);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.LATLONBOUNDINGBOX)==0)
+    					{
     						bbox = new BoundaryBox();
     						bbox.setSrs("4326");
     						value = parser.getAttributeValue("",CapabilitiesTags.MINX);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setXmin(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MINY);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setYmin(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MAXX);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setXmax(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MAXY);
     						if ((value != null) && (Utilities.isNumber(value)))
     							bbox.setYmax(Double.parseDouble(value));
     						setLatLonBox(bbox);
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.SCALEHINT)==0)
+    					{
     						value = parser.getAttributeValue("",CapabilitiesTags.MIN);
     						if ((value != null) && (Utilities.isNumber(value)))
     							setScaleMin(Double.parseDouble(value));
     						value = parser.getAttributeValue("",CapabilitiesTags.MAX);
     						if ((value != null) && (Utilities.isNumber(value)))
     							setScaleMax(Double.parseDouble(value));
+    					}
     					else if (parser.getName().compareTo(CapabilitiesTags.STYLE)==0)
+    					{
     						WMSStyle1_1_1 style = new WMSStyle1_1_1();
     						style.parse(parser);
     						if((style != null) && (style.getName() != null))
+    						{
     							styles.put(style.getName(),style);
+    						}
+    					}
     					break;
     				case KXmlParser.END_TAG:
     					if (parser.getName().compareTo(CapabilitiesTags.LAYER) == 0)
     						end = true;
     					break;
     				case KXmlParser.TEXT:
     					break;
+    			 }
     			 //if (!end)
     			 //{
     				 currentTag = parser.next();
     			 //}
+        	}
         	//parser.require(KXmlParser.END_TAG, null, CapabilitiesTags.LAYER);
             children = new ArrayList();
+        }
         /**
          * <p>Parses the contents of the parser(WMSCapabilities)
          * to extract the information about an WMSLayer</p>
+         *
          */
         public void parse(KXmlParser parser, TreeMap layerTreeMap)
         throws IOException, XmlPullParserException
+        {
             int currentTag;
             boolean end = false;
             String value;
             BoundaryBox bbox;
             parser.require(KXmlParser.START_TAG, null, CapabilitiesTags.LAYER);
             //First of all set whether the layer is Queryable reading the attribute.
             value = parser.getAttributeValue("", CapabilitiesTags.QUERYABLE);
             if (value != null)
+            {
                 if (value.compareTo("0")==0)
                     setQueryable(false);
                 else
                     setQueryable(true);
+            }
             currentTag = parser.nextTag();
             while (!end)
+            {
                 switch(currentTag)
+                {
                     case KXmlParser.START_TAG:
                         if (parser.getName().compareTo(CapabilitiesTags.LAYER)==0)
+                        {
                             WMSLayer1_1_1 lyr = new WMSLayer1_1_1();
                             //parser.next();
                             lyr.parse(parser, layerTreeMap);
                             lyr.setParent(this);
                             getChildren().add(lyr);
                             layerTreeMap.put(lyr.getName(), lyr);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.NAME)==0)
+                        {
                             value = parser.nextText();
                             if (value != null) setName(value);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.TITLE)==0)
+                        {
                             value = parser.nextText();
                             if (value != null) setTitle(value);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.ABSTRACT)==0)
+                        {
                             value = parser.nextText();
                             if (value != null) setAbstract(value);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.SRS)==0)
+                        {
                             value = parser.nextText();
                             if (value != null) addSrs(value);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.BOUNDINGBOX)==0)
+                        {
                             bbox = new BoundaryBox();
                             value = parser.getAttributeValue("",CapabilitiesTags.SRS);
                             if (value != null)
                                 bbox.setSrs(value);
                             value = parser.getAttributeValue("",CapabilitiesTags.MINX);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setXmin(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MINY);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setYmin(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MAXX);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setXmax(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MAXY);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setYmax(Double.parseDouble(value));
                             addBBox(bbox);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.LATLONBOUNDINGBOX)==0)
+                        {
                             bbox = new BoundaryBox();
                             bbox.setSrs("EPSG:4326");
                             value = parser.getAttributeValue("",CapabilitiesTags.MINX);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setXmin(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MINY);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setYmin(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MAXX);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setXmax(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MAXY);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 bbox.setYmax(Double.parseDouble(value));
                             addBBox(bbox);
                             setLatLonBox(bbox);
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.SCALEHINT)==0)
+                        {
                             value = parser.getAttributeValue("",CapabilitiesTags.MIN);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 setScaleMin(Double.parseDouble(value));
                             value = parser.getAttributeValue("",CapabilitiesTags.MAX);
                             if ((value != null) && (Utilities.isNumber(value)))
                                 setScaleMax(Double.parseDouble(value));
+                        }
                         else if (parser.getName().compareTo(CapabilitiesTags.STYLE)==0)
+                        {
                             WMSStyle1_1_1 style = new WMSStyle1_1_1();
                             style.parse(parser);
                             if((style != null) && (style.getName() != null))
+                            {
                                 styles.put(style.getName(),style);
+                            }
+                        }
                         break;
                     case KXmlParser.END_TAG:
                         if (parser.getName().compareTo(CapabilitiesTags.LAYER) == 0)
                             end = true;
                         break;
                     case KXmlParser.TEXT:
                         break;
+                }
                 //if (!end)
                 //{
                 currentTag = parser.next();
                 //}
+            }
             //parser.require(KXmlParser.END_TAG, null, CapabilitiesTags.LAYER);
+        }
+     }
         public String toString(){
             return super.toString();
+        }
+    }

     					else if (parser.getName().compareTo(CapabilitiesTags.LAYER)==0)
+    					{
     						WMSLayer1_1_1 lyr = new WMSLayer1_1_1();
     						lyr.parse(parser,layers);
                             rootLayer = lyr;
     						lyr.parse(parser, layers);
     						//if((lyr != null) && (lyr.getName() != null))
     						//{
                             if (lyr.getName()!=null)
     							layers.put(lyr.getName(), lyr);
     							//Add all the SRS that the layer supports to the WMSProtocolHandler if they dont exist already
     							for (i=0;i<lyr.getAllSrs().size();i++)

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.remoteClient;
     import java.io.BufferedOutputStream;
     import java.io.DataOutputStream;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.net.ConnectException;
     import java.net.URL;
     import java.net.UnknownHostException;
     import com.devx.io.TempFileManager;
     public abstract class OGCProtocolHandler {
     	/**
     	 * procotol handler name
     	 */
         protected String name;
         /**

... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff