Revision 53 branches/v1_9_0/libGPE-GML/src/org/gvsig/gpe/gml/parser/v2/coordinates/GmlCoodinatesIterator.java

View differences:

GmlCoodinatesIterator.java
7 7

  
8 8
import org.gvsig.gpe.gml.parser.GPEDefaultGmlParser;
9 9
import org.gvsig.gpe.gml.utils.GMLTags;
10
import org.gvsig.gpe.xml.stream.EventType;
10 11
import org.gvsig.gpe.xml.stream.IXmlStreamReader;
11 12
import org.gvsig.gpe.xml.stream.XmlStreamException;
12 13
import org.gvsig.gpe.xml.utils.CompareUtils;
......
85 86
		COORDINATES_DECIMAL = GMLTags.GML_DEFAULT_COORDINATES_DECIMAL;
86 87
		
87 88
		for (int i=0 ; i<parser.getAttributeCount() ; i++){
88
			if (CompareUtils.compareWithNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_DECIMAL)){
89
			if (CompareUtils.compareWithOutNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_DECIMAL)){
89 90
				COORDINATES_DECIMAL = parser.getAttributeValue(i);
90
			}else if (CompareUtils.compareWithNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_CS)){
91
			}else if (CompareUtils.compareWithOutNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_CS)){
91 92
				COORDINATES_SEPARATOR = parser.getAttributeValue(i);
92
			}else if (CompareUtils.compareWithNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_TS)){
93
			}else if (CompareUtils.compareWithOutNamespace(parser.getAttributeName(i),GMLTags.GML_COORDINATES_TS)){
93 94
				TUPLES_SEPARATOR = parser.getAttributeValue(i);
94
			}else if (CompareUtils.compareWithNamespace(parser.getAttributeName(i),GMLTags.GML_SRSDIMENSION)){
95
			}else if (CompareUtils.compareWithOutNamespace(parser.getAttributeName(i),GMLTags.GML_SRSDIMENSION)){
95 96
			   	dimension = Integer.valueOf(parser.getAttributeValue(i)).intValue();
96 97
			}
97 98
		}
......
101 102
	 * @see org.gvsig.gpe.gml.parser.IGmlCoordinatesIterator#parseAll()
102 103
	 */
103 104
	public void parseAll() throws XmlStreamException {
104
		QName tag = parser.getName();
105
		int currentTag = parser.getEventType();
105
		QName tag = parser.getElementName();
106
		EventType currentTag = parser.getEventType();
106 107
		boolean endCoordinates = false;
107 108
		
108 109
		while (!endCoordinates){
109
			switch(currentTag){
110
				case IXmlStreamReader.END_ELEMENT:
110
			switch(currentTag.getCode()){
111
				case EventType.END_ELEMENT_CODE:
111 112
					if (CompareUtils.compareWithNamespace(tag,lastTag)){
112 113
						endCoordinates = true;						
113 114
					}
......
115 116
			}
116 117
			if (!endCoordinates){					
117 118
				currentTag = parser.next();
118
				tag = parser.getName();				
119
				tag = parser.getElementName();				
119 120
			}			
120 121
		}	
121 122
	}

Also available in: Unified diff