/ - Diff - | gvSIG desktop 1 - gvSIG

     package org.gvsig.remoteClient.wms;
     import java.awt.geom.Rectangle2D;
     import java.util.Vector;
     /**
-...
         // List of layer styles
         private Vector styles;
         // extent required by the WMS client
         private org.gvsig.remoteClient.utils.BoundaryBox bbox;
         private Rectangle2D extent;
         // sets the list of layers required by the WMS client
-...
         public boolean removeStyleName(String _name) {
             return styles.remove(_name);
+        }
     /**
      * <p>Gets the extent defined by the map</p>
      */
         public Rectangle2D getExtent() {
             return extent;
+        }
     /**
      * <p>Sets the extent defined by the map</p>
      */
         public void setExtent(Rectangle2D extent) {
             this.extent = extent;
+        }
+     }

     import org.gvsig.remoteClient.wms.wms_1_1_1.WMSProtocolHandler1_1_1;
     /**
      * <p></p>
      * <p>Represents the class the with the necessary logic to connect to a OGCWMS and interpretate the data </p>
+     *
      */
     public class WMSClient extends org.gvsig.remoteClient.RasterClient {
-...
         public WMSClient()
         {}
         /**
          * Constructor.
          * the parameter host, indicates the WMS host to connect.
          * */
     	public WMSClient(String host)
+    	{
     		//m_log = LogManager.getLogManager().getLogger(getClass().getName());
-...
     			handler.setHost(host);
+    		}
     		catch(Exception e)
     		{}
+    		{
     			//TODO: Implement logic to handle exceptions...
+    		}
+    	}
     /**
      * <p>Does ...</p>
+     *
      * <p>One of the three interfaces that OGC WMS defines. Request a map.</p>
      */
         public void getMap() {
             handler.getMap();
         public void getMap(WMSStatus status) {
             handler.getMap(status);
+        }
     /**
      * <p>Does ...</p>
      * <p>One of the three interfaces defined by OGC WMS, it gets the service capabilities</p>
+     *
      */
         public void getCapabilities() {
-...
+        }
     /**
      * <p>Does ...</p>
+     *
+     *
      * <p>One of the three interfaces defined by the OGC WMS, it gets the information about a feature requested</p>
      * @return
      */
         public String getFeatureInfo() {
-...
+        }
     /**
      * <p>Does ...</p>
+     *
+     *
      * @return
      * <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>Does ...</p>
+     *
+     *
      * @return
      * <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)
-...
+        }
     /**
      * <p>Does ...</p>
      * <p>Gets the WMSLayer with this name</p>
+     *
+     *
      * @param _name
      * @return
      * @param _name, layer name
      * @return the layer with this name
      */
         public WMSLayer getLayer(String _name) {
           	if (layers.get(_name) != null)
-...
         	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>Does ...</p>
+     *
+     *
      * @return
      * <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>Does ...</p>
+     *
+     *
      * @return
      * <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;
+        }
     /**
      * <p>Does ...</p>
+     *
      */
         public void close() {
             // your code here
+        }
-...
     			return true;
     		} catch (Exception e) {
     			//throw new DriverException(e);
     			return true;
     			//TODO:
     			//Implement the logic to handle all the exceptions....
     			return false;
+    		}
+    	}
+     }

          * WMS client</p>
          */
         public void getMap() {
             // your code here
         public byte[] getMap(WMSStatus status) {
             return null;
+        }
     	/**
-...
     	 */
         public void getCapabilities()
+        {
     		String ret = new String();
         	URL query = null;
     		ret = ret + getHost() + "REQUEST=GetCapabilities&SERVICE=WMS&";
     		ret = ret + "VERSION=" + getVersion();
     		ret += ("&EXCEPTIONS=XML");
         	URL request = null;
     		try
+    		{
     			query = new URL(ret);
     			request = new URL(buildCapabilitiesRequest());
+    		}
     		catch(Exception e)
+    		{
-...
+    	    	{
     		    	DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
     		    	byte[] buffer = new byte[1024*256];
     		    	InputStream is = query.openStream();
     		    	InputStream is = request.openStream();
     		    	long readed = 0;
     		    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     		    		dos.write(buffer, 0, i);
-...
         	return null;
+        }
         /**
          * Builds the GetCapabilitiesRequest according to the OGC WMS Specifications
          */
         private String buildCapabilitiesRequest()
+        {
     		String req = new String();
     		req = req + getHost() + "REQUEST=GetCapabilities&SERVICE=WMS&";
     		req = req + "VERSION=" + getVersion();
     		req += ("&EXCEPTIONS=XML");
     		return req;
+        }
         /**
          * Builds the GetMapRequest according to the OGC WMS Specifications
          */
         private String buildMapRequest(WMSStatus status)
+        {
     		String req = new String();
     		req = req + getHost() + "REQUEST=GetMap&SERVICE=WMS&";
     		req = req + "VERSION=" + getVersion() + "&";
     		req = req + getPartialQuery(status);
            if (status.getExceptionFormat() != null) {
                 req += ("&EXCEPTIONS=" + status.getExceptionFormat());
             } else {
                 req += ("&EXCEPTIONS=XML");
+            }
     		return req;
+        }
         /**
          * Gets the part of the OGC request that share GetMap and GetFeatureInfo
          * @return String request
          */
         public String getPartialQuery(WMSStatus status)
+        {
             String req = "LAYERS=" + status.getLayerNames() + "&STYLES=" +
             			status.getStyles() + "&SRS=" + status.getSrs() +
                 "&BBOX=" + status.getExtent() + "&WIDTH=" + status.getWidth() +
                 "&HEIGHT=" + status.getHeight() + "&FORMAT=" + status.getFormat();
     //        if (status.getTransparency()) {
     //            req += "&TRANSPARENT=TRUE";
     //        }
     //
     //        if (status.getBGColor() != null) {
     //            req += ("&COLOR=" + status.getBGColor());
     //        }
     //
     //        if (time != null) {
     //            req += ("&TIME=" + time);
     //        }
     //
     //        if (elevation != -1) {
     //            req += ("&ELEVATION=" + elevation);
     //        }
             return req.replaceAll(" ", "%20");
+        }
         public void close() {
             // your code here
+        }

     import java.io.OutputStream;
     import java.rmi.NoSuchObjectException;
     import java.util.Vector;
     /**
-...
                throw new NoSuchObjectException("No se pudo parsear el xml");
+           }
+       }
        /**
         * Converts the contents of a Vector to a comma separated list
+        *
         * */
        public static String Vector2CS(Vector v)
+       {
     	   String str = new String();
     	   int i;
     	   for (i=0; i<v.size() ;i++)
+    	   {
+    	   }
     	   return str;
+       }
     	public static boolean isValidVersion(String version)
+    	{
     	 if(version.trim().length() == 5)
+    	  {
     		if ( (version.charAt(1)=='.') && (version.charAt(3)=='.'))
+    		{
     		  char x = version.charAt(0);
     		  char y = version.charAt(2);
     		  char z = version.charAt(4);
     		  if ((Character.isDigit(x)) && (Character.isDigit(y)) && (Character.isDigit(z)))
+    		  {
     			return true;
+    		  }
     		  else
+    		  {
     			return false;
+    		  }
+    		}
     		else
+    		{
     		  return false;
+    		}
+    	  }
     	  else
+    	  {
     		return false;
+    	  }
+    	}
        /**
         * Checks if a String is a number or not
+        *
         * @param String, s

       <property name="src" location="src"/>
       <property name="build" location="bin"/>
       <property name="dist"  location="dist"/>
       <property name="jar" value="RemoteMapClient"/>
       <property name="jar" value="CqRemoteClient"/>
       <!--property name="fmapdir" value="../FMAP"/-->
       <property name="targetDir" location="."/>

| gvSIG desktop 1

Revision 3345