/ - Diff - Application: gvSIG desktop - gvSIG

Revision 40511

     package org.gvsig.remoteclient;
     import org.gvsig.remoteclient.ogc.OGCClientOperation;
     /**
      * This class represents the client status at a certain moment
      * it describes the "graphic" situation or the requirements of the data
      * to be retrieved.
+     *
      */
     public abstract class RemoteClientStatus {
     	// width and heigh of the map
         private int width;
         private int height;
         //format of the image to be retrieved
         private String format;
         private String infoFormat;
         // spatial reference system of the image to be retrieved
         private String srs;
         // exception format, to be retrieved in case of error
         private String exceptionFormat;
         //To set if the client has to use GET or POST
     	private int protocol = OGCClientOperation.PROTOCOL_UNDEFINED;
     	public int getWidth() {
             return width;
+        }
         public void setWidth(int _width) {
         	width = _width;
+        }
         public int getHeight() {
             return height;
+        }
         public void setHeight(int _height) {
             height = _height;
+        }
         public String getFormat() {
             return format;
+        }
         public void setFormat(String _format) {
             format = _format;
+        }
         public String getInfoFormat() {
             return infoFormat;
+        }
         public void setInfoFormat(String _format) {
             infoFormat = _format;
+        }
         public String getSrs() {
             return srs;
+        }
         public void setSrs(String _srs) {
             srs = _srs;
+        }
         public void setExceptionFormat(String _format) {
             exceptionFormat = _format;
+        }
         public String getExceptionFormat() {
             return exceptionFormat;
+        }
         /**
     	 * @return the protocol
     	 */
     	public int getProtocol() {
     		return protocol;
+    	}
     	/**
     	 * @param protocol the protocol to set
     	 */
     	public void setProtocol(int protocol) {
     		this.protocol = protocol;
+    	}
+     }

     package org.gvsig.remoteclient;
     /**
      * <p></p>
+     *
      */
     public abstract class RasterClient extends org.gvsig.remoteclient.RemoteClient implements org.gvsig.remoteclient.IRasterClient {
+     }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 {Iver T.I.}   {Task}
     */
     package org.gvsig.remoteclient.wfs;
     /**
      * This class is used like a container of all the properties
      * that the library is able to retrieve in the XML header of
      * every WFS reply.
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera</a>
      */
     public class WFSRequestInformation {
     	/**
     	 * The attribute may be used by a web
     	 * feature service to indicate the time and
     	 * date when a response was generated.
     	 */
     	private String timeStamp = null;
     	public WFSRequestInformation() {
     		super();
+    	}
     	/**
     	 * @return the timeStamp
     	 */
     	public String getTimeStamp() {
     		return timeStamp;
+    	}
     	/**
     	 * @param timeStamp the timeStamp to set
     	 */
     	public void setTimeStamp(String timeStamp) {
     		this.timeStamp = timeStamp;
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * 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., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     package org.gvsig.remoteclient.wfs;
     import java.util.Vector;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.DataType;
     import org.gvsig.tools.dataTypes.DataTypes;
     import org.gvsig.tools.dataTypes.DataTypesManager;
     /**
      * @author gvSIG Team
      * @version $Id$
+     *
      */
     public class WFSFeatureField {
         protected String name;
         private String type;
         private DataType dataType = null;
         private boolean isGeometry = false;
         private boolean isComplex = false;
         private int geometryType = -1;
         private static final DataTypesManager dataTypesManager = ToolsLocator.getDataTypesManager();
         private Vector fields = new Vector();
         public WFSFeatureField() {
             dataType = dataTypesManager.get(DataTypes.OBJECT);
+        }
         public WFSFeatureField(String name, String type, DataType dataType) {
             super();
             this.name = name;
             this.type = type;
             if (dataType == null){
                 dataType = dataTypesManager.get(DataTypes.OBJECT);
             }else{
                 this.dataType = dataType;
                 if (dataType.getType() == dataTypesManager.getType("Geometry")){
                     isGeometry = true;
+                }
+            }
+        }
         public WFSFeatureField(String name, String type, int geometryType) {
             super();
             this.name = name;
             this.type = type;
             this.dataType = dataTypesManager.get(dataTypesManager.getType("Geometry"));
             this.geometryType = geometryType;
             isGeometry = true;
+        }
         /**
          * @return the name
          */
         public String getName() {
             return name;
+        }
         /**
          * @return the type
          */
         public String getType() {
             return type;
+        }
         /**
          * @return the dataType
          */
         public DataType getDataType() {
             return dataType;
+        }
         /**
          * @return the isGeometry
          */
         public boolean isGeometry() {
             return isGeometry;
+        }
         public boolean isComplex(){
             return isComplex;
+        }
         /**
          * @return the geometryType
          */
         public int getGeometryType() {
             return geometryType;
+        }
         /**
          * @return Returns the fields.
          */
         public WFSFeatureField getFieldAt(int index) {
             if (index >= fields.size()){
                 return null;
+            }
             return (WFSFeatureField)fields.get(index);
+        }
         public int getFieldSize(){
             return fields.size();
+        }
         public void addField(String fieldName, String fieldType, DataType dataType){
             isComplex = true;
             fields.add(new WFSFeatureField(fieldName, fieldType, dataType));
+        }
         public String toString() {
             return getName();
+        }
+    }

     package org.gvsig.remoteclient.wfs;
     import java.io.File;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.Hashtable;
     import java.util.StringTokenizer;
     import org.gvsig.compat.net.ICancellable;
     import org.gvsig.remoteclient.ogc.OGCProtocolHandler;
     import org.gvsig.remoteclient.ogc.OGCServiceInformation;
     import org.gvsig.remoteclient.utils.CapabilitiesTags;
     import org.gvsig.remoteclient.wfs.exceptions.WFSException;
     import org.gvsig.remoteclient.wfs.request.WFSDescribeFeatureTypeRequest;
     import org.gvsig.remoteclient.wfs.request.WFSGetFeatureRequest;
     import org.gvsig.remoteclient.wfs.request.WFSTLockFeatureRequest;
     import org.gvsig.remoteclient.wfs.request.WFSTransactionRequest;
     import org.gvsig.remoteclient.wfs.schema.GMLTags;
     import org.kxml2.io.KXmlParser;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: WFSProtocolHandler.java 34402 2011-01-13 16:47:02Z nbrodin $
      * $Log$
      * Revision 1.11  2007-09-20 09:30:12  jaume
      * removed unnecessary imports
+     *
      * Revision 1.10  2007/02/09 14:11:01  jorpiell
      * Primer piloto del soporte para WFS 1.1 y para WFS-T
+     *
      * Revision 1.9  2007/01/12 13:09:42  jorpiell
      * added searches by area
+     *
      * Revision 1.8  2006/10/10 12:52:28  jorpiell
      * Soporte para features complejas.
+     *
      * Revision 1.7  2006/06/21 12:53:03  jorpiell
      * Se tienen en cuanta el n?mero de features
+     *
      * Revision 1.6  2006/06/14 08:46:07  jorpiell
      * Se tiene en cuanta la opcion para refrescar las capabilities
+     *
      * Revision 1.5  2006/06/14 07:54:18  jorpiell
      * Se parsea el online resource que antes se ignoraba
+     *
      * Revision 1.4  2006/05/30 13:58:03  jaume
      * cancelable downloads
+     *
      * Revision 1.3  2006/05/23 13:23:13  jorpiell
      * Se ha cambiado el final del bucle de parseado y se tiene en cuenta el online resource
+     *
      * Revision 1.2  2006/04/20 16:39:16  jorpiell
      * A?adida la operacion de describeFeatureType y el parser correspondiente.
+     *
      * Revision 1.1  2006/04/19 12:51:35  jorpiell
      * A?adidas algunas de las clases del servicio WFS
+     *
+     *
      */
     /**
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      */
     public abstract class WFSProtocolHandler extends OGCProtocolHandler {
     	//protected static Logger LOG = LoggerFactory.getLogger(WFSProtocolHandler.class);
         /**
     	 * WFS metadata
     	 */
     	protected WFSServiceInformation serviceInfo = new WFSServiceInformation();
     	protected Hashtable features = new Hashtable();
     	protected String currentFeature = null;
     	private int numberOfErrors = 0;
     	/**
     	 * This class contains all the data that the library is able
     	 * to retrieve of the server for all the requests.
     	 */
     	protected ArrayList wfsRequestInformations = new ArrayList();
     	/**
     	 * Clear the connection
     	 */
     	private void clear() {
     		features.clear();
     		serviceInfo.clear();
+    	}
     	/**
     	 * <p>Builds a GetCapabilities request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 */
     	public void getCapabilities(WFSStatus status,boolean override, ICancellable cancel) throws WFSException {
     		URL request = null;
     		try {
     			request = new URL(buildCapabilitiesRequest(status));
     			if (override){
     			    downloader.removeURL(request);
+    			}
     			File f = downloader.downloadFile(request,"wfs_capabilities.xml", cancel);
     			if (f == null)
     				return;
     			clear();
     			parseCapabilities(f);
     		} catch (Exception e){
     			throw new WFSException(e);
+    		}
+    	}
     	/**
     	 * @return
     	 */
     	private String buildCapabilitiesRequest(WFSStatus status) {
     		StringBuffer req = new StringBuffer();
     		String symbol = null;
     		String onlineResource;
     		if (status == null || status.getOnlineResource() == null)
     			onlineResource = getHost();
     		else
     			onlineResource = status.getOnlineResource();
     		symbol = getSymbol(onlineResource);
     		req.append(onlineResource).append(symbol).append("REQUEST=GetCapabilities&SERVICE=WFS&");
     		req.append("VERSION=").append(getVersion()).append("&EXCEPTIONS=XML");
     		return req.toString();
+    	}
     	/**
     	 * Builds the GetCapabilitiesRequest according to the OGC WFS Specifications
     	 * without a VERSION, to get the highest version than a WFS supports.
     	 */
     	public static String buildCapabilitiesSuitableVersionRequest(String _host, String _version)
+    	{
     		int index = _host.indexOf('?');
     		if (index > -1) {
     			String host = _host.substring(0, index + 1);
     			String query = _host.substring(index + 1, _host.length());
     			StringTokenizer tokens = new StringTokenizer(query, "&");
     			String newQuery = "", token;
     			// If there is a field or a value with spaces, (and then it's on different tokens) -> unify them
     			while (tokens.hasMoreTokens()) {
     				token = tokens.nextToken().trim();
     				if (token.toUpperCase().compareTo("REQUEST=GETCAPABILITIES") == 0)
     					continue;
     				if (token.toUpperCase().compareTo("SERVICE=WFS") == 0)
     					continue;
     				if ((_version != null) && (_version.length() > 0)) {
     					if (token.toUpperCase().compareTo("VERSION=" + _version) == 0)
     						continue;
+    				}
     				if (token.toUpperCase().compareTo("EXCEPTIONS=XML") == 0)
     					continue;
     				newQuery += token + "&";
+    			}
     			_host = host + newQuery;
+    		}
     		else {
     			_host += "?";
+    		}
     		if ((_version != null) && (_version.compareTo("") != 0))
     			_host += "REQUEST=GetCapabilities&SERVICE=WFS&VERSION=" + _version + "&EXCEPTIONS=XML";
     		else
     			_host += "REQUEST=GetCapabilities&SERVICE=WFS&EXCEPTIONS=XML";
     		return _host;
+    	}
     	/**
     	 * <p>Builds a describeFeatureType request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 * @param status
     	 * WFS client status. Contains all the information to create
     	 * the query. In this case, the only the feature name is needed.
     	 */
     	public File describeFeatureType(WFSStatus status,boolean override, ICancellable cancel)throws WFSException {
     		this.currentFeature = status.getFeatureFullName();
     		//sets the namespace URI
     		if ((status.getNamespacePrefix() != null) && (status.getNamespaceLocation() == null)){
     			String namespaceURI = serviceInfo.getNamespace(status.getNamespacePrefix());
     			if (namespaceURI != null){
     				status.setNamespaceLocation(namespaceURI);
+    			}
+    		}
     		try {
     			WFSDescribeFeatureTypeRequest request = createDescribeFeatureTypeRequest(status);
     			File f = request.sendRequest(cancel);
     			return f;
     		} catch (Exception e){
     			throw new WFSException(e);
+    		}
+    	}
     	/**
     	 * <p>Builds a getFeature request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 * @param status
     	 * WFS client status. Contains all the information to create
     	 * the query.
     	 * @return File
     	 * GML file
     	 */
     	public File getFeature(WFSStatus status,boolean override, ICancellable cancel) throws WFSException{
     		try{
     			WFSGetFeatureRequest request = createGetFeatureRequest(status);
     			File f = request.sendRequest(cancel);
     			parseGetFeature(f, status.getNamespacePrefix());
     			return f;
     		} catch (Exception e){
     			throw new WFSException(e);
+    		}
+    	}
     	/**
     	 * parses the data retrieved by the GetFeature XML document. It is
     	 * used just to find errors
     	 */
     	protected abstract boolean parseGetFeature(File f,String nameSpace) throws WFSException;
     	/**
     	 * <p>Builds a transaction request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 * @param status
     	 * WFS client status. Contains all the information to create
     	 * the query.
     	 */
     	public void transaction(WFSStatus status,boolean override, ICancellable cancel) throws WFSException {
     		try {
     		    WFSTransactionRequest request = createTransactionRequest(status);
                 File f = request.sendRequest(cancel);
                 parseTransaction(f, status);
     		} catch (Exception e){
     			throw new WFSException(e);
+    		}
+    	}
     	/**
     	 * <p>Builds a transaction request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 * @param status
     	 * WFS client status. Contains all the information to create
     	 * the query.
     	 */
     	private String buildTransactionRequest(WFSStatus status){
     		StringBuffer req = new StringBuffer();
     		String symbol = null;
     		String onlineResource;
     		if(serviceInfo.getOnlineResource(CapabilitiesTags.WFS_TRANSACTION) != null){
     			onlineResource = serviceInfo.getOnlineResource(CapabilitiesTags.WFS_TRANSACTION);
     		}else {
     			onlineResource = getHost();
+    		}
     		symbol = getSymbol(onlineResource);
     		req.append(onlineResource);
     		return req.toString();
+    	}
     	/**
     	 * parses the data retrieved by the transaction operation
     	 * @param f
     	 * The retrieved file
     	 * @param nameSpace
     	 * The namespace
     	 */
     	protected abstract boolean parseTransaction(File f,  WFSStatus status) throws WFSException;
     	/**
     	 * <p>Builds a lockFeature request that is sent to the WFS
     	 * the response will be parse to extract the data needed by the
     	 * WFS client</p>
     	 * @param status
     	 * WFS client status. Contains all the information to create
     	 * the query.
     	 */
     	public void lockFeature(WFSStatus status,boolean override, ICancellable cancel) throws WFSException {
     		try {
     			WFSTLockFeatureRequest request = createLockFeatureRequest(status);
     			File f = request.sendRequest(cancel);
     			parseLockFeature(f,status.getNamespacePrefix(),status);
     		} catch(WFSException e) {
     			throw e;
     		} catch (Exception e){
     			throw new WFSException(e);
+    		}
+    	}
     	/**
     	 * parses the data retrieved by the LockFeature operation
     	 */
     	protected abstract boolean parseLockFeature(File f,String nameSpace, WFSStatus status) throws WFSException;
     	/**
     	 * @return Returns the features.
     	 */
     	public Hashtable getFeatures() {
     		return features;
+    	}
     	/**
     	 * @return Returns the currentFeature.
     	 */
     	public String getCurrentFeature() {
     		return currentFeature;
+    	}
     	/**
     	 * @param currentFeature The currentFeature to set.
     	 */
     	public void setCurrentFeature(String currentFeature) {
     		this.currentFeature = currentFeature;
+    	}
     	/**
     	 * It parses the attributes of the current KXMLParser
     	 * and add the new namespaces to the service information
     	 * @param parser
     	 * The KXML parser
     	 */
     	protected void parseNamespaces(KXmlParser parser){
     		for (int i=0 ; i<parser.getAttributeCount() ; i++){
     			String attName = parser.getAttributeName(i);
     			if (attName.startsWith(GMLTags.XML_NAMESPACE)){
     				int index = attName.indexOf(":");
     				if (index > 0){
     					serviceInfo.addNamespace(attName.substring(index+1, attName.length()),
     							parser.getAttributeValue(i));
+    				}
+    			}
+    		}
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.remoteClient.ogc.OGCProtocolHandler#getServiceInformation()
     	 */
     	public OGCServiceInformation getServiceInformation() {
     		return serviceInfo;
+    	}
     	/**
     	 * @param status
     	 * The WFS status
     	 * @param protocolHandler
     	 * The handler to parse the requests
     	 * @return an object to send the DescribeFeatureType requests
     	 */
     	protected abstract WFSDescribeFeatureTypeRequest createDescribeFeatureTypeRequest(WFSStatus status);
     	/**
     	 * @param status
     	 * The WFS status
     	 * @param protocolHandler
     	 * The handler to parse the requests
     	 * @return an object to send the GetFeature requests
     	 */
     	protected abstract WFSGetFeatureRequest createGetFeatureRequest(WFSStatus status);
     	/**
     	 * @param status
     	 * The WFS status
     	 * @param protocolHandler
     	 * The handler to parse the requests
     	 * @return an object to send the LockFeature requests
     	 */
     	protected abstract WFSTLockFeatureRequest createLockFeatureRequest(WFSStatus status);
     	/**
          * @param status
          * The WFS status
          * @param protocolHandler
          * The handler to parse the requests
          * @return an object to send the Transaction request
          */
     	protected abstract WFSTransactionRequest createTransactionRequest(WFSStatus status);
     	/**
     	 * @return the wfsRequestInformations
     	 */
     	ArrayList getWfsRequestInformations() {
     		return wfsRequestInformations;
+    	}
     	/**
     	 * Adds a new WFSRequestInformation
     	 * @param wfsRequestInformation
     	 */
     	public void addLastWfsRequestInformation(
     			WFSRequestInformation wfsRequestInformation) {
     		wfsRequestInformations.add(wfsRequestInformation);
+    	}
     	/**
     	 * @return the lastWfsRequestInformation
     	 */
     	public WFSRequestInformation getLastWfsRequestInformation() {
     		if (wfsRequestInformations.size() > 0){
     			return (WFSRequestInformation)wfsRequestInformations.get(wfsRequestInformations.size() - 1);
+    		}
     		return null;
+    	}
+    }

     package org.gvsig.remoteclient.wfs;
     import java.util.Hashtable;
     import org.gvsig.remoteclient.ogc.OGCClientOperation;
     import org.gvsig.remoteclient.utils.CapabilitiesTags;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: WFSOperation.java 29650 2009-06-29 17:07:18Z jpiera $
      * $Log$
      * Revision 1.1  2007-02-09 14:11:01  jorpiell
      * Primer piloto del soporte para WFS 1.1 y para WFS-T
+     *
+     *
      */
     /**
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      */
     public class WFSOperation extends OGCClientOperation{
     	protected static Hashtable operations = new Hashtable();
     	static{
     		operations.put(CapabilitiesTags.GETCAPABILITIES, new WFSOperation(CapabilitiesTags.GETCAPABILITIES));
     		operations.put(CapabilitiesTags.WFS_DESCRIBEFEATURETYPE, new WFSOperation(CapabilitiesTags.WFS_DESCRIBEFEATURETYPE));
     		operations.put(CapabilitiesTags.WFS_GETFEATURE, new WFSOperation(CapabilitiesTags.WFS_GETFEATURE));
     		operations.put(CapabilitiesTags.WFS_TRANSACTION, new WFSOperation(CapabilitiesTags.WFS_TRANSACTION));
     		operations.put(CapabilitiesTags.WFS_LOCKFEATURE, new WFSOperation(CapabilitiesTags.WFS_LOCKFEATURE));
+    	}
     	public WFSOperation(String operationName) {
     		super(operationName);
+    	}
     	public WFSOperation(String operationName, String onlineResource) {
     		super(operationName, onlineResource);
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.remoteClient.OGCClientOperation#getOperations()
     	 */
     	public Hashtable getOperations() {
     		return operations;
+    	}
+    }

     package org.gvsig.remoteclient.wfs.schema;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: XMLNameSpace.java 9729 2007-01-15 13:11:17Z csanchez $
      * $Log$
      * Revision 1.2  2007-01-15 13:11:00  csanchez
      * Sistema de Warnings y Excepciones adaptado a BasicException
+     *
      * Revision 1.1  2006/12/22 11:25:04  csanchez
      * Nuevo parser GML 2.x para gml's sin esquema
+     *
      * Revision 1.1  2006/08/10 12:00:49  jorpiell
      * Primer commit del driver de Gml
+     *
+     *
      */
     /**
      * This class represent a XSD schema file
+     *
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Carlos S?nchez Peri??n (sanchez_carper@gva.es)
+     *
      */
     public class XMLNameSpace {
     	private String prefix = null;
     	private String location = null;
     	public XMLNameSpace(String prefix,String location) {
     		super();
     		this.prefix = prefix;
     		this.location = location;
+    	}
     	/**
     	 * @return Returns the location.
     	 */
     	public String getLocation() {
     		return location;
+    	}
     	/**
     	 * @return Returns the name.
     	 */
     	public String getPrefix() {
     		return prefix;
+    	}
     	/**
     	 * @param location The location to set.
     	 */
     	public void setLocation(String location) {
     		this.location = location;
+    	}
+    }

     package org.gvsig.remoteclient.wfs.schema;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: GMLTags.java 9723 2007-01-14 13:12:11Z jaume $
      * $Log$
      * Revision 1.4  2007-01-14 13:12:11  jaume
      * objects to strings
+     *
      * Revision 1.3  2006/12/22 11:25:44  csanchez
      * Nuevo parser GML 2.x para gml's sin esquema
+     *
      * Revision 1.2  2006/08/10 12:37:05  jorpiell
      * A?adido el tag description al GML parser
+     *
      * Revision 1.1  2006/08/10 12:00:49  jorpiell
      * Primer commit del driver de Gml
+     *
+     *
      */
     /**
      * Class containing a description for all the TAGS defined in
      * the GML File
+     *
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Carlos S?nchez Peri??n (sanchez_carper@gva.es)
+     *
      */
     public class GMLTags {
     	public static final String VERSION = "version";
     	public static final String XML_TARGET_NAMESPACE = "targetNamespace";
     	public static final String XML_ELEMENT_FORM_DEFAULT = "elementFormDefault";
     	public static final String XML_ATTRIBUTE_FORM_DEFAULT = "attributeFormDefault";
     	public static final String XML_NAMESPACE = "xmlns";
     	public static final String XML_SCHEMA_LOCATION = "schemaLocation";
     	public static final String GML_NAME = "name";
     	public static final String GML_DESCRIPTION = "description";
     	public static final String GML_BOUNDEDBY = "boundedBy";
     	public static final String GML_BOX = "Box";
     	public static final String GML_COORDINATES = "coordinates";
     	public static final String GML_COORD = "coord";
     	public static final String GML_X = "X";
     	public static final String GML_Y = "Y";
     	public static final String GML_COORDINATES_DECIMAL = "decimal";
     	public static final String GML_COORDINATES_CS = "cs";
     	public static final String GML_COORDINATES_TS = "ts";
     	public static final String GML_SRS_NAME = "srsName";
     	//GML types
     	public static final String GML_POINT = "Point";
     	public static final String GML_MUNTILINE = "MultiLineString";
+    }

     package org.gvsig.remoteclient.wfs.schema;
     import java.io.IOException;
     import org.gvsig.compat.CompatLocator;
     import org.gvsig.remoteclient.utils.EncodingXMLParser;
     import org.xmlpull.v1.XmlPullParserException;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: XMLSchemaParser.java 18271 2008-01-24 09:06:43Z jpiera $
      * $Log$
      * Revision 1.7  2007-01-15 13:11:00  csanchez
      * Sistema de Warnings y Excepciones adaptado a BasicException
+     *
      * Revision 1.6  2006/12/29 17:15:48  jorpiell
      * Se tienen en cuenta los simpleTypes y los choices, adem?s de los atributos multiples
+     *
      * Revision 1.5  2006/12/22 11:25:44  csanchez
      * Nuevo parser GML 2.x para gml's sin esquema
+     *
      * Revision 1.4  2006/10/10 12:52:28  jorpiell
      * Soporte para features complejas.
+     *
      * Revision 1.3  2006/10/02 08:33:49  jorpiell
      * Cambios del 10 copiados al head
+     *
      * Revision 1.1.2.1  2006/09/19 12:23:15  jorpiell
      * Ya no se depende de geotools
+     *
      * Revision 1.2  2006/09/18 12:08:55  jorpiell
      * Se han hecho algunas modificaciones que necesitaba el WFS
+     *
      * Revision 1.1  2006/08/10 12:00:49  jorpiell
      * Primer commit del driver de Gml
+     *
      * Revision 1.1  2006/05/16 14:12:56  jorpiell
      * A?adido el parseador de Esquemas
+     *
+     *
      */
     /**
      * Thas class is used to parse a schema XSD
+     *
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Carlos S?nchez Peri??n (sanchez_carper@gva.es)
+     *
      */
     public class XMLSchemaParser extends EncodingXMLParser {
     	private String targetNameSpace = null;
     	private String schema = "";
     	private String encoding = "UTF-8";
     	private String nameSpace = "";
     	private String version = null;
     	public XMLSchemaParser(){
     		super();
+    	}
     	public XMLSchemaParser(String schema){
     		super();
     		//schema instace is named with the string in "schema"
     		this.schema = schema;
+    	}
     	/**
     	 * It gets the schema from a tag. The schema is separated
     	 * of the tag name by ":".
     	 * @param tag
     	 */
     	public void setSchemaFromMainTag(String tag){
     		//set the name string of the namespace.
     		int pos = tag.indexOf(":");
     		if (pos > 0){
     			this.schema = tag.substring(0,pos);
     		}else{
     			this.schema = "";
+    		}
+    	}
     	/**
     	 * @return Returns the schema.
     	 */
     	public String getSchema() {
     		return schema;
+    	}
     	/**
     	 * @param schema The schema to set.
     	 */
     	public void setSchema(String schema) {
     		this.schema = schema;
+    	}
     	/**
     	 * Returns a SCHEMA:TAG
     	 * @param tag
     	 * @return SCHEMA:TAG
     	 */
     	private String getTag(String tag){
     		//get the tag without the namespace
     		if (tag == null){
     			return null;
+    		}
     		if ((schema == null) || (schema.equals(""))){
     			return tag;
+    		}
     		return schema + ":" + tag;
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.xmlpull.v1.XmlPullParser#require(int, java.lang.String, java.lang.String)
     	 */
     	public void require(int type, String namespace, String name)
     		throws XmlPullParserException, IOException{
     		super.require(type,namespace,getTag(name));
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.xmlpull.v1.XmlPullParser#getName()
     	 */
     	public String getName(){
     		try{
     		String name = super.getName();
     		if ((schema != null) || (!(schema.equals("")))){
     			return name.substring(name.indexOf(":") + 1,name.length());
+    		}
     		return name;
     		}catch (NullPointerException e){
     			return "";
+    		}
+    	}
     	/*
     	 *  (non-Javadoc)
     	 * @see org.xmlpull.v1.XmlPullParser#getName()
     	 */
     	public String getNameSpace(){
     		try{
     		String name = super.getName();
     		if ((name!=null)&&(CompatLocator.getStringUtils().split(name,":").length > 1)){
     			return CompatLocator.getStringUtils().split(name, ":")[0];
+    		}
     		return "";
     		}catch (NullPointerException e){
     			return "";
+    		}
+    	}
     	public String getversion() {
     		if (version == null){
     			//return the default GML version
     			return "99.99.99";
+    		}
     		return version;
+    	}
     	public String getTargetNamespace() {
     		return targetNameSpace;
+    	}
+    }

     package org.gvsig.remoteclient.wfs.schema.type;
     import java.util.Hashtable;
     import java.util.Map;
     /* 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
      */
     /* CVS MESSAGES:
+     *
      * $Id: GMLException.java 18271 2008-01-24 09:06:43Z jpiera $
      * $Log$
      * Revision 1.1  2007-01-15 13:11:00  csanchez
      * Sistema de Warnings y Excepciones adaptado a BasicException
+     *
      * Revision 1.2  2006/12/22 11:25:44  csanchez
      * Nuevo parser GML 2.x para gml's sin esquema
+     *
      * Revision 1.1  2006/08/10 12:00:49  jorpiell
      * Primer commit del driver de Gml
+     *
+     *
      */
     /**
      * GML Exception.
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Carlos S?nchez Peri??n (sanchez_carper@gva.es)
+     *
      */
     public class GMLException extends Exception {
     	private static final long serialVersionUID = -5486463227342843579L;
     	private String filename="";
     	protected String formatString;
     	protected String messageKey;
     	protected long code;
     	public GMLException() {
+    	}
     	public GMLException(String file) {
     		init();
     		this.filename=file;
+    	}
     	public GMLException(Throwable exception) {
     		init();
     		initCause(exception);
+    	}
     	public GMLException(String file, Throwable exception) {
     		init();
     		this.filename=file;
     		initCause(exception);
+    	}
     	public String getFilename() {
     		return filename;
+    	}
     	public void setFilename(String filename) {
     		this.filename = filename;
+    	}
     	protected Map values() {
     		//Key -> value... filename -> name of the file
     		Hashtable params;
     		params = new Hashtable();
     		params.put("file",filename);
     		return params;
+    	}
     	public void init() {
     		messageKey="Gml_Error";
     		formatString="Error opening GML shape %(file)";
     		code = serialVersionUID;
+    	}
+    }

     package org.gvsig.remoteclient.wfs.schema.type;
     import java.util.Map;
     /* 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

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

Also available in: Unified diff