/ - Diff - Application: gvSIG desktop - gvSIG

     import java.io.OutputStream;
     import java.rmi.NoSuchObjectException;
     import java.util.StringTokenizer;
     import java.util.Vector;
-...
+          }
           return true;
+        }
     	/**
     	 * Parses the String containing different items [character] separated and
     	 * creates a vector with them.
     	 * @param str String contains item1[c]item2[c]item3...
     	 * @param c is the string value for separating the items
     	 * @return Vector containing all the items
     	 */
     	public static Vector createVector(String str, String c)
+    	{
     		StringTokenizer tokens = new StringTokenizer(str, c);
     		Vector v = new Vector();
     		try
+    		{
     			while (tokens.hasMoreTokens())
+    			{
     				v.addElement(tokens.nextToken());
+    			}
     			return v;
+    		}
     		catch (Exception e)
+    		{
     			return new Vector();
+    		}
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 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.exceptions;
     /**
      * Excepci?n provocada por el WMS.
+     *
      * @author Vicente Caballero Navarro
      */
     public class WMSException extends Exception {
     	/**
+    	 *
     	 */
     	public WMSException() {
     		super();
+    	}
     	/**
     	 * Crea WMSException.
+    	 *
     	 * @param message
     	 */
     	public WMSException(String message) {
     		super(message);
+    	}
     	/**
     	 * Crea WMSException.
+    	 *
     	 * @param message
     	 * @param cause
     	 */
     	public WMSException(String message, Throwable cause) {
     		super(message, cause);
+    	}
     	/**
     	  * Crea WMSException.
+    	 *
     	 * @param cause
     	 */
     	public WMSException(Throwable cause) {
     		super(cause);
+    	}
+    }

     	public static void main(String[] args)
+    	{
     		WMSClient wmsclient = new WMSClient("http://orto.cth.gva.es:80/wmsconnector/com.esri.wms.Esrimap/wms_urbanismo_tematicos?");
     		//http://orto.cth.gva.es/wmsconnector/com.esri.wms.Esrimap/wms_urbanismo_tematicos?REQUEST=GetMap&SERVICE=WMS&VERSION=1.1.1&LAYERS=3&STYLES=&SRS=EPSG:4326&BBOX=-1.5597948439,37.8178641941,0.5286772976,40.8151000365&WIDTH=500&HEIGHT=500&FORMAT=image/jpeg&EXCEPTIONS=XML
     		try
+    		{
     			wmsclient.connect();
-...
     //			status.addLayerName("europa_rivieren");
     //			status.addStyleName("default");
     //			status.addStyleName("default");
     			status.setSrs("EPSG:23030");
     			Rectangle2D extent = new Rectangle2D.Double(600000,4189000,800000,4514000);
     			status.setSrs("EPSG:4326");
     			Rectangle2D extent = new Rectangle2D.Double(-1.5597948439,37.8178641941,-1.5597948439-0.5286772976,37.8178641941-40.8151000365);
     			status.setExtent(extent);
     			status.setFormat("image/jpeg");
     			status.setHeight(500);
     			status.setWidth(500);
     			wmsclient.getMap(status);
     			//wmsclient.getMap(status);
     			wmsclient.getFeatureInfo(status,300,300);
     			//wmsclient.getFeatureInfo(status,300,300);
     			System.out.println();
+    		}

     package org.gvsig.remoteClient.wms;
     import java.io.IOException;
     import java.util.ArrayList;
     import java.util.Hashtable;
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.utils.BoundaryBox;
     import org.gvsig.remoteClient.wms.wms_1_1_1.WMSLayer1_1_1;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParserException;
-...
      */
     public abstract class WMSLayer implements org.gvsig.remoteClient.ILayer {
     	ArrayList children = new ArrayList();
     	WMSLayer1_1_1 parent = new WMSLayer1_1_1();
     /**
      * <p>Layer Abstract field in the capabilities document </p>
      */
-...
      */
         public void setAbstract(String _abstract) {
             layerAbstract = _abstract;
+        }
+        }
     public ArrayList getChildren() {
     	return children;
+    }
     public void setChildren(ArrayList children) {
     	this.children = children;
+    }
     public WMSLayer1_1_1 getParent() {
     	return parent;
+    }
     public void setParent(WMSLayer1_1_1 parent) {
     	this.parent = parent;
+    }
+     }

     package org.gvsig.remoteClient.wms;
     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;
     /**
      * <p>Represents the class the with the necessary logic to connect to a OGCWMS and interpretate the data </p>
+     *
-...
         private org.gvsig.remoteClient.wms.WMSProtocolHandler handler;
         private TreeMap layers = new TreeMap();
         public WMSClient()
         {}
         /**
          * Constructor.
-...
     		setHost(host);
     		try
+    		{
     			//TODO: implement a correctly negotiate algorithm
     			//TODO: implement a correct negotiation algorithm
     			//handler = WMSProtocolHandlerFactory.negotiate(new URL(host));
     			handler = new WMSProtocolHandler1_1_1();
     			handler.setHost(host);
+    		}
     		catch(Exception e)
+    		{
     			//TODO: Implement logic to handle exceptions...
+    		}
     			e.printStackTrace();
+    		}
+    	}
     	public String getVersion()
+    	{
     		return handler.getVersion();
+    	}
     /**
      * <p>One of the three interfaces that OGC WMS defines. Request a map.</p>
      */
         public void getMap(WMSStatus status) {
             handler.getMap(status);
         public byte[] getMap(WMSStatus status) throws WMSException{
             return handler.getMap(status);
+        }
     /**
-...
      * <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) {
             return handler.getFeatureInfo(status, x, y);
         public String getFeatureInfo(WMSStatus status, int x, int y, int featureCount) throws WMSException{
             return handler.getFeatureInfo(status, x, y, featureCount);
+        }
     /**
-...
         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;
+    	}
+    }
     /**
      * <p>Does ...</p>
      * 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)
-...
     					return false;
+    				}
+    			}
     			getCapabilities();
     			return true;
     		} catch (Exception e) {
     			//TODO:
     			//Implement the logic to handle all the exceptions....
     			e.printStackTrace();
     			return false;
+    		}
+    	}
+     }
         //TODO Check this out: Always 1 layer at first level...
         public WMSLayer getLayersRoot() {
         	return (WMSLayer)layers.values().toArray()[0];
+        }
+    }

     import java.io.DataOutputStream;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.OutputStream;
     import java.net.ConnectException;
     import java.net.URL;
     import java.net.UnknownHostException;
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.utils.Utilities;
     import com.devx.io.TempFileManager;
     /**
      * <p> Abstract class that represents handlers to comunicate via WMS protocol.
      * </p>
-...
     			//TODO:
     			//pass this buildXXXRequest to the WMSProtocolHandlerXXX: The request can depend on the WMS version.
     			request = new URL(buildMapRequest(status));
     	    	byte[] buffer = new byte[1024*256];
     	    	byte[] imageBytes = null;
     	    	InputStream is = request.openStream();
     	    	int readed = 0;
     	    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     	    		byte[] buffered = new byte[readed+i];
     	    		for (int j = 0; j < buffered.length; j++) {
     	    			if (j<readed){
     	    				buffered[j] = imageBytes[j];
+    	    			}
     	    			else {
     	    				buffered[j] = buffer[j-readed];
+    	    			}
+    				}
     	    		imageBytes = (byte[]) buffered.clone();
     	    		readed += i;
+    	    	}
     			return imageBytes;
+    		}
     		catch(Exception e)
+    		{
     			// TODO something about the exceptionsssss....!!!
+    		}
         	try
+        	{
         		System.out.println(request.toString());
         		File f = new File("map.jpeg");
         	  DataOutputStream dos = new DataOutputStream(new FileOutputStream(f));
     		  OutputStream bos = null;
     	    	byte[] buffer = new byte[1024*256];
     	    	InputStream is = request.openStream();
     	    	//long readed = 0;
     	    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     	    		dos.write(buffer, 0, i);
     	    		//readed += i;
+    	    	}
     	    	dos.close();
     	    return null;
+        	}
         	catch(Exception e)
+        	{
         		//TODO
         		//Implement the correct logic to handle all the exceptions.
         		return null;
+        	}
     		return null;
+        }
     	/**
-...
+    		}
     		catch(Exception e)
+    		{
     			// TODO something about the exceptionsssss....!!!
     			e.printStackTrace();
+    		}
     	   	File f = null;
     	   	f = new File("tochangethis.txt");
     	    if (!f.exists())
+    	    {
     	    	try
+    	    	{
     		    	DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
     		    	byte[] buffer = new byte[1024*256];
     		    	InputStream is = request.openStream();
     		    	long readed = 0;
     		    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     		    		dos.write(buffer, 0, i);
     		    		readed += i;
+    		    	}
     		    	dos.close();
+    	    	}
     	    	catch(Exception e)
     	    	{}
+    	    }
     //	   	File f = null;
     //	   	f = new File("tochangethis.txt");
     //
     //	    if (!f.exists())
     //	    {
     //	    	try
     //	    	{
     //		    	DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
     //		    	byte[] buffer = new byte[1024*256];
     //		    	InputStream is = request.openStream();
     //		    	long readed = 0;
     //		    	for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     //		    		dos.write(buffer, 0, i);
     //		    		readed += i;
     //		    	}
     //		    	dos.close();
     //	    	}
     //	    	catch(Exception e)
     //	    	{}
     //	    }
     		try
+    		{
     		File f = downloadFile(request,"wms_capabilities.xml");
     	    parse(f);
     	    //return parse(f);
+    		}
     		catch(Exception e)
+    		{
     			//TODO
     			e.printStackTrace();
+    		}
+        }
     /**
      * <p>It will send a GetFeatureInfo request to the WMS
      * Parsing the response and redirecting the info to the WMS client</p>
      */
         public String getFeatureInfo(WMSStatus status, int x, int y)
         public String getFeatureInfo(WMSStatus status, int x, int y, int featureCount)
+        {
         	URL request = null;
     		try
-...
         private String buildCapabilitiesRequest()
+        {
     		String req = new String();
     		req = req + getHost() + "REQUEST=GetCapabilities&SERVICE=WMS&";
     		String host = getHost();
     		if (!host.endsWith("?"))
     			req = req + getHost() + "?REQUEST=GetCapabilities&SERVICE=WMS&";
     		else
     			req = req + getHost() + "REQUEST=GetCapabilities&SERVICE=WMS&";
     		req = req + "VERSION=" + getVersion();
     		req += ("&EXCEPTIONS=XML");
     		return req;
-...
         private String buildGetFeatureInfoRequest(WMSStatus status, int x, int y)
+        {
     		String req = new String();
     		req = req + getHost() + "REQUEST=GetFeatureInfo&SERVICE=WMS&";
     		if (!host.endsWith("?"))
     			req = req + getHost() + "?REQUEST=GetFeatureInfo&SERVICE=WMS&";
     		else
     			req = req + getHost() + "REQUEST=GetFeatureInfo&SERVICE=WMS&";
     		req = req + "QUERY_LAYERS="+Utilities.Vector2CS(status.getLayerNames());
     		req = req + "&VERSION=" + getVersion() + "&";
     		req = req + getPartialQuery(status);
-...
         private String buildMapRequest(WMSStatus status)
+        {
     		String req = new String();
     		req = req + getHost() + "REQUEST=GetMap&SERVICE=WMS&";
     		if (!host.endsWith("?"))
     			req = req + getHost() + "?REQUEST=GetMap&SERVICE=WMS&";
     		else
     			req = req + getHost() + "REQUEST=GetMap&SERVICE=WMS&";
     		req = req + "VERSION=" + getVersion() + "&";
     		req = req + getPartialQuery(status);
            if (status.getExceptionFormat() != null) {
-...
                 email = new String();
                 formats = new Vector();
+            }
+         }
+         }
         /**
          * Downloads an URL into a temporary file that is removed the next time the
          * tempFileManager class is called, which means the next time gvSIG is launched.
+         *
          * @param url
          * @param name
          * @return
          * @throws IOException
          * @throws ServerErrorResponseException
          * @throws ConnectException
          * @throws UnknownHostException
          */
         private File downloadFile(URL url, String name) throws IOException,ConnectException, UnknownHostException{
         	File f = null;
     	    try{
     	    	f = TempFileManager.createTempFile(name, "tmp");
     	    	System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\ndownloading '"+url.toString()+"' to: "+f.getAbsolutePath());
     	    	f.deleteOnExit();
     	    } catch (IOException io) {
     	    	io.printStackTrace();
+    	    }
     	    DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
     	    byte[] buffer = new byte[1024*256];
     	    InputStream is = url.openStream();
     	    long readed = 0;
     	    for (int i = is.read(buffer); i>0; i = is.read(buffer)){
     	    	dos.write(buffer, 0, i);
     	    	readed += i;
+    	    }
     	    dos.close();
     	    /*if (!isNotAnException(f))
     	    	// SI que es una excepci?n
     	    	throw new ServerErrorResponseException();*/
     	    return f;
+    	}
+     }

     package org.gvsig.remoteClient.wms.wms_1_1_1;
     import java.io.IOException;
     import java.util.ArrayList;
     import org.gvsig.remoteClient.utils.BoundaryBox;
     import org.gvsig.remoteClient.utils.CapabilitiesTags;
-...
      */
     public class WMSLayer1_1_1 extends org.gvsig.remoteClient.wms.WMSLayer {
     /**
      * <p>Parses the contents of the parser(WMSCapabilities)
      * to extract the information about an WMSLayer</p>
-...
     			 switch(currentTag)
+    			 {
     				case KXmlParser.START_TAG:
     					if (parser.getName().compareTo(CapabilitiesTags.NAME)==0)
     					/*if (parser.getName().compareTo(CapabilitiesTags.LAYER)==0)
+    					{
     						WMSLayer1_1_1 lyr = new WMSLayer1_1_1();
     						parser.next();
     						lyr.parse(parser);
     						lyr.setParent(this);
     						getChildren().add(lyr);
+    					}
     					else */if (parser.getName().compareTo(CapabilitiesTags.NAME)==0)
+    					{
     						value = parser.nextText();
     						if (value != null) setName(value);
-...
     				case KXmlParser.TEXT:
     					break;
+    			 }
     			 if (!end)
+    			 {
     			 //if (!end)
     			 //{
     				 currentTag = parser.next();
+    			 }
     			 //}
+        	}
         	parser.require(KXmlParser.END_TAG, null, CapabilitiesTags.LAYER);
         	//parser.require(KXmlParser.END_TAG, null, CapabilitiesTags.LAYER);
+        }
+     }

       <property name="src" location="src"/>
       <property name="build" location="bin"/>
       <property name="dist"  location="dist"/>
       <property name="lib"  location="lib"/>
       <property name="jar" value="CqRemoteClient"/>
       <!--property name="fmapdir" value="../FMAP"/-->
       <property name="targetDir" location="."/>
       <property name="targetDir2" location="../FMap 03/lib"/>
       <target name="init">
         <!-- Create the time stamp -->
         <tstamp/>
-...
         <jar jarfile="${dist}/${jar}.jar" basedir="${build}"/>
         <jar jarfile="${dist}/${jar}.jar" basedir="." includes = "images/*.gif" update="true" />
         <move todir="${targetDir}/">
         <move todir="${targetDir2}/">
         	<fileset dir="${dist}" includes="**/**"/>
         </move>
       	<copy todir="${targetDir2}/">
       	    	<fileset dir="${lib}" includes="*.jar"/>
       	</copy>
      <!--   <move todir="${targetDir}/">
          	<fileset dir="${dist}" includes="**/**"/>
          </move>-->
       </target>
       <target name="clean"

trunk/libraries/libRemoteServices/.classpath
7	7	<classpathentry kind="lib" path="/Andami/lib/log4j-1.2.8.jar"/>
8	8	<classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
9	9	<classpathentry kind="lib" path="C:/projects/gvsig/workspace/Cq RemoteClient/lib/kxml2.jar"/>
	10	<classpathentry kind="lib" path="/Andami/lib/tempFileManager.jar"/>
10	11	<classpathentry kind="output" path="bin"/>
11	12	</classpath>

     import java.net.ProtocolException;
     import java.net.URL;
     import org.gvsig.remoteClient.wms.WMSStatus;
     /**
      * Interfaz Driver para WMS.
+     *
-...
     	 * @throws IOException
     	 * @throws ProtocolException
     	 */
     	Image getMap(com.iver.wmsclient.MapQuery mapQuery)
     	//Image getMap(com.iver.wmsclient.MapQuery mapQuery)
     	Image getMap(WMSStatus mapQuery)
     		throws WMSException, IOException, ProtocolException;
     	//    String getFeatureInfo(InfoQuery infoQuery) throws WMSException, IOException, ProtocolException;

     import javax.imageio.ImageIO;
     import org.exolab.castor.xml.ValidationException;
     import org.gvsig.remoteClient.wms.WMSClient;
     import org.gvsig.remoteClient.wms.WMSStatus;
     import com.iver.cit.gvsig.fmap.drivers.WMSDriver;
     import com.iver.cit.gvsig.fmap.drivers.WMSException;
     import com.iver.wmsclient.Capabilities;
     import com.iver.wmsclient.FeatureInfoQuery;
     import com.iver.wmsclient.MapQuery;
     import com.iver.wmsclient.UnsupportedVersionException;
     import com.iver.wmsclient.WMSClient;
     import com.iver.wmsclient.WMSClientFactory;
     //import com.iver.wmsclient.Capabilities;
     //import com.iver.wmsclient.FeatureInfoQuery;
     //import com.iver.wmsclient.MapQuery;
     //import com.iver.wmsclient.UnsupportedVersionException;
     //import com.iver.wmsclient.WMSClient;
     //import com.iver.wmsclient.WMSClientFactory;
     /**
-...
      * @author Vicente Caballero Navarro
      */
     public class FMapWMSDriver implements WMSDriver {
     	private MapQuery lastMapQuery;
     	//private MapQuery lastMapQuery;
     	//private WMSClient client;
     	private WMSStatus wmsStatus;
     	private WMSClient client;
     	/**
     	 * @see com.iver.cit.gvsig.fmap.drivers.WMSDriver#getCapabilities(java.net.URL)
     	 */
     	public void getCapabilities(URL servidor)
     		throws WMSException, IOException, ProtocolException {
     		try {
     			Capabilities c = getClient(servidor).getCapabilities(servidor);
     		} catch (UnsupportedVersionException e) {
     			//Capabilities c = getClient(servidor).getCapabilities(servidor);
     			getClient(servidor).connect();
     		//} catch (UnsupportedVersionException e) {
     		} catch (Exception e) {
     			throw new WMSException(e);
+    		}
+    	}
-...
     	/**
     	 * @see com.iver.cit.gvsig.fmap.drivers.WMSDriver#getMap(com.iver.cit.gvsig.fmap.drivers.wms.MapQuery)
     	 */
     	public Image getMap(MapQuery mapQuery)
     	public Image getMap(WMSStatus wmsstatus)
     		throws WMSException, IOException, ProtocolException {
     		BufferedImage image = new BufferedImage(mapQuery.getWidth(),
     				mapQuery.getHeight(), BufferedImage.TYPE_INT_ARGB);
     		BufferedImage image = new BufferedImage(wmsstatus.getWidth(),
     				wmsstatus.getHeight(), BufferedImage.TYPE_INT_ARGB);
     		try {
     			byte[] res = client.doMapQuery(mapQuery);
     			byte[] res = client.getMap(wmsstatus);
     			ByteArrayInputStream inbytes = new ByteArrayInputStream(res);
     			image = ImageIO.read(inbytes);
     			return image;
     		} catch (ValidationException e) {
     			throw new ProtocolException();
     		} catch (com.iver.wmsclient.WMSException e) {
     //		} catch (ValidationException e) {
     //			throw new ProtocolException();
     		} catch (org.gvsig.remoteClient.exceptions.WMSException e) {
     			throw new WMSException(e);
     		} catch (NoSuchFieldException e) {
     			throw new RuntimeException(
     				"No se incluyeron todos los campos necesarios de la petici?n");
     //		} catch (NoSuchFieldException e) {
     //			throw new RuntimeException(
     //				"No se incluyeron todos los campos necesarios de la petici?n");
+    		}
+    	}
     	/**
     	 * @see com.iver.cit.gvsig.fmap.drivers.WMSDriver#getFeatureInfo(com.iver.cit.gvsig.fmap.drivers.wms.InfoQuery)
     	 */
     	public String getFeatureInfo(FeatureInfoQuery infoQuery)
     	//public String getFeatureInfo(FeatureInfoQuery infoQuery)
     	public String getFeatureInfo(WMSStatus wmsStatus)
     		throws WMSException, IOException, ProtocolException {
     		return null;
+    	}
-...
     	 * @throws IOException
     	 */
     	private WMSClient getClient(URL url)
     		throws UnsupportedVersionException, IOException {
     		throws IOException {
     		if (client == null) {
     			client = WMSClientFactory.getClient(url);
     			//client = WMSClientFactory.getClient(url);
     			client = new WMSClient(url.toString());
+    		}
     		return client;

     import org.cresques.px.Extent;
     import org.cresques.px.PxRaster;
     import org.exolab.castor.xml.ValidationException;
     import org.gvsig.remoteClient.exceptions.WMSException;
     import org.gvsig.remoteClient.utils.Utilities;
     import org.gvsig.remoteClient.wms.WMSClient;
     import org.gvsig.remoteClient.wms.WMSStatus;
     import com.devx.io.TempFileManager;
     import com.iver.cit.gvsig.fmap.DriverException;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.drivers.WMSException;
     import com.iver.cit.gvsig.fmap.drivers.UnsupportedVersionException;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.InfoByPoint;
     import com.iver.cit.gvsig.fmap.operations.Cancellable;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
     import com.iver.wmsclient.FeatureInfoQuery;
     import com.iver.wmsclient.MapQuery;
     import com.iver.wmsclient.UnsupportedVersionException;
     import com.iver.wmsclient.WMSClient;
     import com.iver.wmsclient.WMSClientFactory;
     /**
-...
     	private String infoLayerQuery;
     	public URL host;
     	private WMSClient wmsClient;
     	private MapQuery lastMapQuery;
     	//private MapQuery lastMapQuery;
     	private WMSStatus wmsStatus;
     	private Rectangle2D fullExtent;
     	private StatusRasterInterface		status = null;
-...
     		throws WMSException, IllegalStateException, ValidationException,
     			UnsupportedVersionException, IOException {
     		String[] formats;
     		formats = getWmsClient().getInfoFormats();
     		formats = (String[]) getWmsClient().getFormats().toArray(new String[0]); //.getInfoFormats();
     		for (int i = 0; i < formats.length; i++) {
     			if (formats[i].equals("GML.1")) {
-...
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.InfoByPoint#queryByPoint(com.iver.cit.gvsig.fmap.operations.QueriedPoint)
     	 */
     	public String queryByPoint(Point p) throws DriverException {
     		FeatureInfoQuery query = new FeatureInfoQuery(lastMapQuery);
     		query.setFeatureCount(Integer.MAX_VALUE);
     		query.setX((int) p.getX());
     		query.setY((int) p.getY());
     		query.setInfoQuery(infoLayerQuery);
     //		FeatureInfoQuery query = new FeatureInfoQuery(lastMapQuery);
     //		query.setFeatureCount(Integer.MAX_VALUE);
     //		query.setX((int) p.getX());
     //		query.setY((int) p.getY());
     //		query.setInfoQuery(infoLayerQuery);
     		try {
     			query.setInfoFormat(selectFormat());
     			return new String(getWmsClient().doFeatureInfo(query));
     		} catch (WMSException e) {
     //			query.setInfoFormat(selectFormat());
     //			return new String(getWmsClient().doFeatureInfo(query));
     			return new String(getWmsClient()
     					.getFeatureInfo(wmsStatus,(int)p.getX(),(int)p.getY(),Integer.MAX_VALUE));
     		} catch (WMSException  e) {
     			return "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><exception>" +
     			e.getMessage() + "</exception>";
     		} catch (ValidationException e) {
-...
     			throw new DriverException("Conflicto de versiones", e);
     		} catch (IOException e) {
     			throw new DriverException("Error en la conexi?n", e);
     		} catch (com.iver.wmsclient.WMSException e) {
     			throw new DriverException(e.getMessage(), e);
     		} catch (NoSuchFieldException e) {
     			throw new RuntimeException(
     				"No se rellenaron todos los campos de la petici?n");
+    		}
     //		} catch (com.iver.wmsclient.WMSException e) {
     //			throw new DriverException(e.getMessage(), e);
     		//}
     //		catch (NoSuchFieldException e) {
     //			throw new RuntimeException(
     //				"No se rellenaron todos los campos de la petici?n");
     //		}
+    	}
     	/**
-...
     	 * 		com.iver.cit.gvsig.fmap.operations.Cancellable)
     	 */
     	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
     		Cancellable cancel,double scale) throws DriverException {
     			Cancellable cancel,double scale) throws DriverException {
     		if (isWithinScale(scale)){
     		try {
     			MapQuery mapQuery = getWmsClient().createQuery();
     			mapQuery.setBBOX(viewPort.getAdjustedExtent());
     			mapQuery.setFormat(m_Format);
     			mapQuery.setHeight(viewPort.getImageHeight());
     			// System.err.println("m_Mapa.getHeight() = " + m_Mapa.getHeight());
     			mapQuery.setLayers(layerQuery);
     			mapQuery.setSRS(m_SRS);
     			mapQuery.setStyles("");
     			mapQuery.setWidth(viewPort.getImageWidth());
     			mapQuery.setExceptions("application/vnd.ogc.se_xml");
     			byte[] bytes;
     			lastMapQuery = mapQuery;
     			bytes = getWmsClient().doMapQuery(lastMapQuery);
     			ByteArrayInputStream inbytes = new ByteArrayInputStream(bytes);
     			//BufferedImage tempImg = ImageIO.read(inbytes);
     			// LWS Cambio de estrategia en el posicionado para la impresi?n.
     			Point2D p2=new Point2D.Double(viewPort.getAdjustedExtent().getX(), viewPort.getAdjustedExtent().getMaxY()); //viewPort.getOffset();
     			viewPort.getAffineTransform().transform(p2, p2);
     			rasterProcess(g, viewPort, createTemp(inbytes, "wms_Query", viewPort));
     			if(status!=null && firstLoad){
     				status.applyStatus(this);
     				firstLoad = false;
     			try {
     //				MapQuery mapQuery = getWmsClient().createQuery();
     //				mapQuery.setBBOX(viewPort.getAdjustedExtent());
     //				mapQuery.setFormat(m_Format);
     //				mapQuery.setHeight(viewPort.getImageHeight());
     //				mapQuery.setLayers(layerQuery);
     //				mapQuery.setSRS(m_SRS);
     //				mapQuery.setStyles("");
     //				mapQuery.setWidth(viewPort.getImageWidth());
     //				mapQuery.setExceptions("application/vnd.ogc.se_xml");
     				if (wmsStatus == null)
+    				{
     					wmsStatus = new WMSStatus();
+    				}
     				wmsStatus.setExtent(viewPort.getAdjustedExtent());
     				wmsStatus.setFormat(m_Format);
     				wmsStatus.setHeight( viewPort.getImageHeight());
     				wmsStatus.setLayerNames(Utilities.createVector(layerQuery,","));
     				wmsStatus.setSrs(m_SRS);
     				byte[] bytes;
     //				lastMapQuery = mapQuery;
     //				bytes = getWmsClient().doMapQuery(lastMapQuery);
     				bytes = getWmsClient().getMap(wmsStatus);
     				ByteArrayInputStream inbytes = new ByteArrayInputStream(bytes);
     				//BufferedImage tempImg = ImageIO.read(inbytes);
     				// LWS Cambio de estrategia en el posicionado para la impresi?n.
     				Point2D p2=new Point2D.Double(viewPort.getAdjustedExtent().getX(), viewPort.getAdjustedExtent().getMaxY()); //viewPort.getOffset();
     				viewPort.getAffineTransform().transform(p2, p2);
     				rasterProcess(g, viewPort, createTemp(inbytes, "wms_Query", viewPort));
     				if(status!=null && firstLoad){
     					status.applyStatus(this);
     					firstLoad = false;
+    				}
     				//g.drawImage(tempImg,(int)p2.getX(),(int)p2.getY(), null);
     			} catch (ValidationException e) {
     				throw new DriverException("No se reconoce el formato de la respuesta",
     						e);
     			} catch (UnsupportedVersionException e) {
     				throw new DriverException("Conflicto de versiones", e);
     			} catch (IOException e) {
     				throw new DriverException("Error en la conexi?n", e);
     			} catch (WMSException e) {
     				throw new DriverException(e.getMessage(), e);
     //				} catch (NoSuchFieldException e) {
     //				throw new RuntimeException(
     //				"No se rellenaron todos los campos de la petici?n");
     //				}
+    			}
     			//g.drawImage(tempImg,(int)p2.getX(),(int)p2.getY(), null);
     		} catch (ValidationException e) {
     			throw new DriverException("No se reconoce el formato de la respuesta",
     				e);
     		} catch (UnsupportedVersionException e) {
     			throw new DriverException("Conflicto de versiones", e);
     		} catch (IOException e) {
     			throw new DriverException("Error en la conexi?n", e);
     		} catch (com.iver.wmsclient.WMSException e) {
     			throw new DriverException(e.getMessage(), e);
     		} catch (NoSuchFieldException e) {
     			throw new RuntimeException(
     				"No se rellenaron todos los campos de la petici?n");
+    		}
+    		}
+    	}
     	/**
-...
     		throws IllegalStateException, ValidationException,
     			UnsupportedVersionException, IOException {
     		if (wmsClient == null) {
     			wmsClient = WMSClientFactory.getClient(host);
     			//wmsClient = WMSClientFactory.getClient(host);
     			wmsClient = new WMSClient(host.toString());
+    		}
     		return wmsClient;

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 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 com.iver.cit.gvsig.gui.wizard;
     import org.gvsig.remoteClient.wms.WMSLayer;
     /**
      * DOCUMENT ME!
+     *
      * @author Fernando Gonz?lez Cort?s
      */
     public class WizardData {
         private String title;
         private String Abstract;
         private WMSLayer layer;
         private String[] formats;
         /**
          * DOCUMENT ME!
+         *
          * @return
          */
         public String getAbstract() {
             return Abstract;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @return
          */
         public String[] getFormats() {
             return formats;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @return
          */
         public WMSLayer getLayer() {
             return layer;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @return
          */
         public String getTitle() {
             return title;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @param string
          */
         public void setAbstract(String string) {
             Abstract = string;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @param strings
          */
         public void setFormats(String[] strings) {
             formats = strings;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @param info
          */
         public void setLayer(WMSLayer info) {
             layer = info;
+        }
         /**
          * DOCUMENT ME!
+         *
          * @param string
          */
         public void setTitle(String string) {
             title = string;
+        }
+    }

     /*
      * Created on 09-sep-2004
+     *
      * To change the template for this generated file go to
      * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
      */
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 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 com.iver.cit.gvsig.gui.wizard;
     import java.awt.geom.Rectangle2D;
     import java.io.IOException;
     import java.net.URL;
     import org.exolab.castor.xml.ValidationException;
     import com.iver.cit.gvsig.fmap.drivers.UnsupportedVersionException;
     /**
      * @author fernando
+     *
      * To change the template for this generated type comment go to
      * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
      */
     public interface WizardDataSource {
     	public WizardData detalles(URL host)throws IllegalStateException, ValidationException,
     	UnsupportedVersionException, IOException ;
     	public Rectangle2D getBoundingBox(String[] layerName, String srs);
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 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 com.iver.cit.gvsig.gui.wizard;
     import javax.swing.event.TreeModelListener;
     import javax.swing.tree.TreeModel;
     import javax.swing.tree.TreePath;
     import org.gvsig.remoteClient.wms.WMSLayer;
     public class LayerTreeModel implements TreeModel {
     	WMSLayer root;
     	public LayerTreeModel(WMSLayer root){
     		this.root = root;
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#getRoot()
     	 */
     	public Object getRoot() {
     		return root;
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#getChildCount(java.lang.Object)
     	 */
     	public int getChildCount(Object parent) {
     		return ((WMSLayer)parent).getChildren().size();
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#isLeaf(java.lang.Object)
     	 */
     	public boolean isLeaf(Object node) {
     		return ((WMSLayer)node).getChildren().size() == 0;
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#addTreeModelListener(javax.swing.event.TreeModelListener)
     	 */
     	public void addTreeModelListener(TreeModelListener l) {
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#removeTreeModelListener(javax.swing.event.TreeModelListener)
     	 */
     	public void removeTreeModelListener(TreeModelListener l) {
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#getChild(java.lang.Object, int)
     	 */
     	public Object getChild(Object parent, int index) {
     		return ((WMSLayer)parent).getChildren().get(index);
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#getIndexOfChild(java.lang.Object, java.lang.Object)
     	 */
     	public int getIndexOfChild(Object parent, Object child) {
     		WMSLayer pare = (WMSLayer) parent;
     		for (int i = 0; i < pare.getChildren().size(); i++)
     			if (child == pare.getChildren().get(i)) return i;
     		return -1;
+    	}
     	/* (non-Javadoc)
     	 * @see javax.swing.tree.TreeModel#valueForPathChanged(javax.swing.tree.TreePath, java.lang.Object)
     	 */
     	public void valueForPathChanged(TreePath path, Object newValue) {
+    	}
+    }

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004 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 com.iver.cit.gvsig.gui.wizard;
     import javax.swing.AbstractListModel;
     /**
      * DOCUMENT ME!
+     *

Application: gvSIG desktop

Revision 3377