/ - Diff - Application: gvSIG desktop - gvSIG

     		while(it.hasNext()){
     			String key = (String)it.next();
     			String[] parts = key.split(":");
     			if (parts.length > 1){
     			if (parts.length == 1){
     				if (parts[0].compareTo(typeAux.toUpperCase())==0){
     					return (IXMLType)types.get(key);
+    				}
     			}else if (parts.length > 1){
     				if (parts[parts.length-1].compareTo(typeAux.toUpperCase())==0){
     					return (IXMLType)types.get(key);
+    				}

     import java.io.File;
     import java.io.FileReader;
     import java.io.IOException;
     import java.util.Hashtable;
     import java.util.Iterator;
     import java.util.Set;
     import java.util.Vector;
     import org.gvsig.remoteClient.utils.CapabilitiesTags;
     import org.gvsig.remoteClient.utils.EncodingXMLParser;
-...
     	private String schema = "";
     	private String encoding = "UTF-8";
     	private String nameSpace = "";
     	private Hashtable attributes = null;
     	private String version = null;
     	public XMLSchemaParser(){
     		super();
     		//initializes a new hash table for many namespace to store the defined types
     		attributes = new Hashtable();
     		super();
+    	}
     	public XMLSchemaParser(String schema){
     		super();
     		//schema instace is named with the string in "schema"
     		this.schema = schema;
     		attributes = new Hashtable();
     		this.schema = schema;
+    	}
     	/**
-...
     							if (getAttributeName(i).compareTo(GMLTags.GML_NAME) == 0){
     								// inserts a new complex type inside the namespace
     								XMLComplexType complexType = XMLTypesFactory.addComplexType(nameSpace,getAttributeValue(i));
     				    			parseComplexType(complexType);
     				    			attributes.put(complexType.getName(),complexType);
     				    			parseComplexType(complexType);
+    				    		}
+    						}
-...
     					 * Etiqueta <element>	*
     					 ************************/
     					else if (getName().compareTo(CapabilitiesTags.ELEMENT)==0){
     						XMLElement entity = XMLElementsFactory.addType(this);
     						try{
     							//Sets the name and type of one element
     							attributes.put(entity.getName(),entity.getEntityType());
     						}catch(NullPointerException e){
     							//Type not defined yet, do nothing here because the type will be declared later
+    						}
     						XMLElement entity = XMLElementsFactory.addType(this);
+    					}
     					break;
     					case KXmlParser.END_TAG:
-...
     			String attName = getAttributeName(i);
     			String attValue = getAttributeValue(i);
     			if (CapabilitiesTags.BASE.equals(attName)){
     				attributes.put(complexType.getName(),attValue);
     				complexType.setBaseType(attValue);
+    			}
+    		}
-...
     				if (getName().compareTo(CapabilitiesTags.ELEMENT)==0){
     					XMLElement element = new XMLElement(this);
     					if (element != null){
     						complexType.addSubtypes(element);
     						complexType.addElements(element);
+    					}
     					elemento_previo=element;
+    				}
-...
     				if (getName().compareTo(CapabilitiesTags.ELEMENT)==0){
     					XMLElement element = new XMLElement(this);
     					if (element != null){
     						complexType.addSubtypes(element);
     						complexType.addElements(element);
+    					}
+    				}
     				break;
-...
+    		}
+    	}
     	/**
     	 * @return Returns the attributes.
     	 */
     	public Hashtable getAttributes() {
     		return attributes;
+    	}
     	public Vector getAttributesList(){
     		Vector vector = new Vector();
     		Set keys = attributes.keySet();
     		Iterator it = keys.iterator();
     		while(it.hasNext()){
     			vector.add(attributes.get((String)it.next()));
+    		}
     		return vector;
+    	}
     	public String getversion() {
     		if (version == null){
     			//return the default GML version

     package org.gvsig.remoteClient.wfs.schema.type;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.LinkedHashMap;
     import java.util.Map;
-...
     import java.util.Vector;
     import org.gvsig.remoteClient.wfs.schema.XMLElement;
     import org.gvsig.remoteClient.wfs.schema.XMLTypesFactory;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
-...
     	public static int CHOICE_TYPE = 1;
     	private String type = null;
     	private LinkedHashMap attributes = null;
     	private LinkedHashMap baseElements = null;
     	private String baseType = null;
     	private int attributesType = 0;
     	public XMLComplexType(String type) {
     		super();
     		this.type = type;
     		attributes = new LinkedHashMap();
     		baseElements = new LinkedHashMap();
+    	}
     	/*
-...
     	 * @return Returns the subtypes.
     	 */
     	public Map getSubtypes() {
     		return attributes;
     		return baseElements;
+    	}
     	/**
     	 * @param subtypes The subtypes to set.
     	 */
     	public void addSubtypes(XMLElement element) {
     	public void addElements(XMLElement element) {
     		if (element.getName() != null){
     			this.attributes.put(element.getName(),element);
     			this.baseElements.put(element.getName(),element);
+    		}
+    	}
     	/**
+    	 *
     	 * @param name
     	 * @return
     	 */
     	public XMLElement getAttribute(String name){
     		return (XMLElement)attributes.get(name);
     		return (XMLElement)baseElements.get(name);
+    	}
     	/**
     	 * @return Returns the vElements.
     	 */
     	public Vector getAttributes() {
     		Set keys = attributes.keySet();
     		Set keys = baseElements.keySet();
     		Iterator it = keys.iterator();
     		Vector vector = new Vector();
     		while(it.hasNext()){
     			vector.add(attributes.get((String)it.next()));
     			vector.add(baseElements.get((String)it.next()));
+    		}
     		if (baseType != null){
     			IXMLType type = XMLTypesFactory.getType(baseType);
     			if (type != null){
     				if (type instanceof XMLComplexType){
     					Vector vector2 = ((XMLComplexType)type).getAttributes();
     					for (int i=0 ; i<vector2.size() ; i++){
     						vector.add(vector2.get(i));
+    					}
+    				}
+    			}
+    		}
     		return vector;
+    	}
-...
     	public void setAttributesType(int attributesType) {
     		this.attributesType = attributesType;
+    	}
     	/**
     	 * @param baseType the baseType to set
     	 */
     	public void setBaseType(String baseType) {
     		this.baseType = baseType;
+    	}
+    }

Application: gvSIG desktop

Revision 28543