/branches/v10/extensions/extWFS2/src/com/iver/cit/gvsig/fmap/layers/FLyrWFS.java - Diff - | gvSIG desktop 1 - gvSIG

Revision 8765 branches/v10/extensions/extWFS2/src/com/iver/cit/gvsig/fmap/layers/FLyrWFS.java

     import java.net.URL;
     import java.util.HashMap;
     import java.util.Map;
     import java.util.Vector;
     import javax.swing.ImageIcon;
     import org.cresques.cts.ProjectionPool;
     import org.gvsig.remoteClient.wfs.WFSAttribute;
     import org.gvsig.remoteClient.gml.schemas.IXMLType;
     import org.gvsig.remoteClient.gml.schemas.XMLComplexType;
     import org.gvsig.remoteClient.gml.schemas.XMLElement;
     import org.gvsig.remoteClient.wfs.WFSStatus;
     import org.gvsig.remoteClient.wfs.filters.FilterEncoding;
     import com.iver.andami.PluginServices;
     import com.iver.cit.gvsig.fmap.DriverException;
-...
     import com.iver.cit.gvsig.fmap.drivers.WFSException;
     import com.iver.cit.gvsig.fmap.drivers.wfs.FMapWFSDriver;
     import com.iver.cit.gvsig.fmap.drivers.wfs.FMapWFSDriverFactory;
     import com.iver.cit.gvsig.fmap.drivers.wfs.filters.SQLExpressionFormat;
     import com.iver.cit.gvsig.fmap.rendering.LegendFactory;
     import com.iver.utiles.StringUtilities;
     import com.iver.utiles.XMLEntity;
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.10.2.4  2006-10-02 12:46:17  jorpiell
      * A?adidos los m?todos para escribirse y recuperarse del XMLEntity
      * Revision 1.10.2.5  2006-11-15 00:08:20  jjdelcerro
      * *** empty log message ***
+     *
      * Revision 1.18  2006/10/31 12:24:04  jorpiell
      * Comprobado el caso en el que los atributos no tienen tipo
+     *
      * Revision 1.17  2006/10/31 09:55:28  jorpiell
      * Se ha modificado el constructor del WFS desde cat?logo
+     *
      * Revision 1.16  2006/10/31 09:38:15  jorpiell
      * Se ha creado una factoria para crear la capa. De ese modo no se repite c?digo desde le panel de propiedades y desde el panel de la capa
+     *
      * Revision 1.15  2006/10/23 07:37:04  jorpiell
      * Ya funciona el filterEncoding
+     *
      * Revision 1.14  2006/10/10 12:55:06  jorpiell
      * Se ha a?adido el soporte de features complejas
+     *
      * Revision 1.13  2006/10/02 12:54:35  jorpiell
      * No se pod?a crear un mapa que tubiera la opci?n enlace vivo habilitada
+     *
      * Revision 1.12  2006/10/02 09:09:45  jorpiell
      * Cambios del 10 copiados al head
+     *
      * Revision 1.10.2.3  2006/09/29 14:12:53  luisw2
      * CRSFactory.getCRS substitutes ProjectionPool.get
+     *
      * Revision 1.10.2.2  2006/09/28 08:54:01  jorpiell
      * Ya se puede reproyectar
+     *
-...
     	private String layerName = null;
         private String userName = null;
         private String password = null;
         private WFSAttribute[] fields = null;
         private String AttributesQuery = null;
         private String CoordinatesQuery = null;
         private XMLElement[] fields = null;
         private int numfeatures = 100;
         private int timeout = 10000;
         private String srs = null;
-...
     		layer.setSelectedFields(layer.getFields());
     		WFSAttribute[] atts = new WFSAttribute[layer.getFields().size()];
     		for (int i=0 ; i<atts.length ; i++){
     			atts[i] = (WFSAttribute)layer.getFields().get(i);
     		Vector vAtts = new Vector();
     		if (layer.getFields().size() == 1){
     			XMLElement element = (XMLElement)layer.getFields().get(0);
     			if (element.getEntityType().getType() != IXMLType.COMPLEX){
     				vAtts.add(element);
     			}else{
     				vAtts = ((XMLComplexType)element.getEntityType()).getAttributes();
+    			}
+    		}
     		for (int i=0 ; i<layer.getFields().size() ; i++){
     			XMLElement element = (XMLElement)layer.getFields().get(i);
     			if (element.getEntityType().getType() != IXMLType.COMPLEX){
     				vAtts.add((XMLElement)layer.getFields().get(i));
     			}else{
+    			}
+    		}
     		XMLElement[] atts = new XMLElement[vAtts.size()];
     		for (int i=0 ; i<vAtts.size() ; i++){
     			atts[i] = (XMLElement)vAtts.get(i);
+    		}
     		setHost(host);
     		setName(sLayer[0]);
-...
         		adapter.setDriver((VectorialDriver) wfsDriver);
         		setSource(adapter);
         		setLegend(LegendFactory.createSingleSymbolLegend(
         				getShapeType()));
         	} catch (Exception e){
-...
         	status.setFields(getFieldNames());
         	status.setOnlineResource(getOnlineResource());
         	status.setSrs(getSrs());
     	   	return status;
         	//Filter Encoding transformation
         	FilterEncoding fe = SQLExpressionFormat.createFilter();
     		fe.setQuery(getAttributesQuery());
     		status.setFilterQuery(fe.toString());
         	return status;
+        }
         /**
-...
     	/**
     	 * @return Returns the fields.
     	 */
     	public WFSAttribute[] getFields() {
     	public XMLElement[] getFields() {
     		if (fields == null){
     			return new WFSAttribute[0];
     			return new XMLElement[0];
+    		}
     		return fields;
+    	}
-...
     	 * @return
     	 */
     	public String[] getFieldNames(){
     		String[] attributes = new String[getFields().length];
     		Vector vAttributes = new Vector();
     		for (int i=0 ; i<getFields().length ; i++){
     			attributes[i] = getFields()[i].getName();
     			if ((getFields()[i].getEntityType() == null) ||
     					(getFields()[i].getEntityType().getType() != IXMLType.COMPLEX)){
     				vAttributes.add(getFields()[i].getName());
+    			}
+    		}
     		String[] attributes = new String[vAttributes.size()];
     		for (int i=0 ; i<vAttributes.size() ; i++){
     			attributes[i] = (String)vAttributes.get(i);
+    		}
     		return attributes;
+    	}
     	/**
     	 * @param fields The fields to set.
     	 */
     	public void setFields(WFSAttribute[] fields) {
     	public void setFields(XMLElement[] fields) {
     		this.fields = fields;
+    	}
     	/**
-...
     		//Layer fields
     		String strFields = "";
     		WFSAttribute[] fields = getFields();
     		XMLElement[] fields = getFields();
     		for (int i=0 ; i<fields.length ; i++){
     			strFields = strFields + fields[i].getName();
     			if (i < fields.length - 1){
-...
     		WFSLayerNode[] layers = driver.getLayerList();
     		WFSLayerNode layer = driver.getLayerInfo(getLayerName());
     		layer.setSelectedFields(layer.getFields());
     		WFSAttribute[] atts = null;
     		XMLElement[] atts = null;
     		if (xml.contains("fields")) {
     			String[] fields = xml.getStringProperty("fields").split("~##SEP1##~");
     			atts = new WFSAttribute[fields.length];
     			atts = new XMLElement[fields.length];
     			for (int i=0 ; i<fields.length ; i++){
     				for (int j=0 ; j<layer.getFields().size() ; j++){
     					WFSAttribute attribute = (WFSAttribute)layer.getFields().get(j);
     					XMLElement attribute = (XMLElement)layer.getFields().get(j);
     					if (attribute.getName().equals(fields[i])){
     						atts[i] = attribute;
     						break;
-...
+    				}
+    			}
     		}else{
     			atts = new WFSAttribute[0];
     			atts = new XMLElement[0];
+    		}
     		layer.setSelectedFields(atts);
     		setWfsDriver(driver);
-...
     		setFields(atts);
     		setAvailable(true);
+    	}
     	/**
     	 * @return Returns the attributesQuery.
     	 */
     	public String getAttributesQuery() {
     		return AttributesQuery;
+    	}
     	/**
     	 * @param attributesQuery The attributesQuery to set.
     	 */
     	public void setAttributesQuery(String attributesQuery) {
     		AttributesQuery = attributesQuery;
+    	}
     	/**
     	 * @return Returns the coordinatesQuery.
     	 */
     	public String getCoordinatesQuery() {
     		return CoordinatesQuery;
+    	}
     	/**
     	 * @param coordinatesQuery The coordinatesQuery to set.
     	 */
     	public void setCoordinatesQuery(String coordinatesQuery) {
     		CoordinatesQuery = coordinatesQuery;
+    	}
+    }

Also available in: Unified diff