Revision 40796
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/util/SLDUtils.java | ||
---|---|---|
123 | 123 |
" in file: " + f.getAbsolutePath()); |
124 | 124 |
} |
125 | 125 |
|
126 |
public static String getTextUntilTag(XmlPullParser parser) |
|
127 |
throws XmlPullParserException, IOException { |
|
128 |
|
|
129 |
String resp = ""; |
|
130 |
/* |
|
131 |
* This allows entering the iteratioin even if current tag is not TEXT |
|
132 |
*/ |
|
133 |
int t = XmlPullParser.TEXT; |
|
134 |
while (t != XmlPullParser.START_TAG |
|
135 |
&& t != XmlPullParser.END_TAG |
|
136 |
&& t != XmlPullParser.END_DOCUMENT) { |
|
137 |
|
|
138 |
t = parser.getEventType(); |
|
139 |
if (t == XmlPullParser.TEXT) { |
|
140 |
resp = resp + parser.getText(); |
|
141 |
} |
|
142 |
t = parser.next(); |
|
143 |
} |
|
144 |
return resp; |
|
145 |
} |
|
146 |
|
|
126 | 147 |
public static boolean isStr(String a, String b) { |
127 | 148 |
|
128 | 149 |
if (a == null && b == null) { |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/DefaultSLDSupportManager.java | ||
---|---|---|
7 | 7 |
import java.io.InputStream; |
8 | 8 |
import java.io.OutputStream; |
9 | 9 |
import java.util.ArrayList; |
10 |
import java.util.Collection; |
|
11 | 10 |
import java.util.HashMap; |
12 | 11 |
import java.util.HashSet; |
13 | 12 |
import java.util.Iterator; |
... | ... | |
18 | 17 |
import org.gvsig.sldsupport.SLDSupportManager; |
19 | 18 |
import org.gvsig.sldsupport.exception.InvalidSLDObjectException; |
20 | 19 |
import org.gvsig.sldsupport.exception.SLDException; |
20 |
import org.gvsig.sldsupport.exception.SLDReadException; |
|
21 | 21 |
import org.gvsig.sldsupport.exception.SLDWriteException; |
22 | 22 |
import org.gvsig.sldsupport.exception.UnsupportedSLDVersionException; |
23 | 23 |
import org.gvsig.sldsupport.reader.SLDReader; |
... | ... | |
175 | 175 |
|
176 | 176 |
|
177 | 177 |
public SLDObject read(File infile) |
178 |
throws InvalidSLDObjectException, IOException {
|
|
178 |
throws SLDException, IOException {
|
|
179 | 179 |
|
180 | 180 |
if (infile == null || !infile.exists()) { |
181 | 181 |
throw new IOException("Null or non-existing file: " |
... | ... | |
208 | 208 |
} |
209 | 209 |
} |
210 | 210 |
} |
211 |
throw new InvalidSLDObjectException("File", |
|
212 |
"Unable to parse file: " + infile.getAbsolutePath()); |
|
211 |
throw new SLDReadException("No SLD readers found."); |
|
213 | 212 |
} |
214 | 213 |
|
215 | 214 |
// public static String VERSION = "1.0.0"; |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/ExternalGraphicElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDExternalGraphic; |
10 | 9 |
import org.kxml2.io.KXmlParser; |
11 | 10 |
import org.xmlpull.v1.XmlPullParser; |
... | ... | |
21 | 20 |
|
22 | 21 |
SLDExternalGraphic resp = new SLDExternalGraphic(); |
23 | 22 |
|
24 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
25 | 24 |
String name = parser.getName(); |
26 | 25 |
String txt = null; |
27 | 26 |
while (!(SLDUtils.isStr(name, SLDTags.EXTERNALGRAPHIC) && tag == KXmlParser.END_TAG)) { |
... | ... | |
31 | 30 |
if (SLDUtils.isStr(name, SLDTags.FORMAT)) { |
32 | 31 |
txt = parser.nextText(); |
33 | 32 |
resp.setFormat(txt); |
33 |
parser.nextTag(); |
|
34 | 34 |
break; |
35 | 35 |
} |
36 | 36 |
if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) { |
... | ... | |
38 | 38 |
String res = parser.getAttributeValue("xlink", "href"); |
39 | 39 |
resp.setIsOnline(true); |
40 | 40 |
resp.setOnlineResource(res); |
41 |
parser.nextTag(); |
|
41 | 42 |
break; |
42 | 43 |
} |
43 | 44 |
if (SLDUtils.isStr(name, SLDTags.INLINE_CONTENT)) { |
... | ... | |
47 | 48 |
txt = parser.nextText(); |
48 | 49 |
resp.setIsOnline(false); |
49 | 50 |
resp.setInlineContent(txt.getBytes()); |
51 |
parser.nextTag(); |
|
50 | 52 |
break; |
51 | 53 |
} |
52 | 54 |
break; |
... | ... | |
55 | 57 |
case KXmlParser.TEXT: |
56 | 58 |
break; |
57 | 59 |
} |
58 |
tag = parser.next(); |
|
60 |
tag = parser.getEventType(); |
|
61 |
name = parser.getName(); |
|
59 | 62 |
} |
60 | 63 |
|
61 |
parser.next(); |
|
64 |
parser.nextTag();
|
|
62 | 65 |
return resp; |
63 | 66 |
} |
64 | 67 |
|
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/LayerFeatureConstraintsElement.java | ||
---|---|---|
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.constraints.SLDFeatureTypeConstraint; |
9 | 9 |
import org.gvsig.sldsupport.sld.constraints.SLDLayerFeatureConstraints; |
10 |
import org.gvsig.sldsupport.sld.layer.SLDUserLayer; |
|
11 |
import org.gvsig.sldsupport.sld.ows.SLDRemoteOWS; |
|
12 | 10 |
import org.kxml2.io.KXmlParser; |
13 | 11 |
import org.xmlpull.v1.XmlPullParser; |
14 | 12 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
23 | 21 |
|
24 | 22 |
SLDLayerFeatureConstraints resp = new SLDLayerFeatureConstraints(); |
25 | 23 |
|
26 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
27 | 25 |
String name = parser.getName(); |
28 | 26 |
String txt = null; |
29 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.LAYER_FEATURE_CONST) && tag == KXmlParser.END_TAG)) { |
... | ... | |
43 | 41 |
case KXmlParser.TEXT: |
44 | 42 |
break; |
45 | 43 |
} |
46 |
tag = parser.next(); |
|
44 |
tag = parser.getEventType(); |
|
45 |
name = parser.getName(); |
|
47 | 46 |
} |
48 | 47 |
|
49 |
parser.next(); |
|
48 |
parser.nextTag();
|
|
50 | 49 |
return resp; |
51 | 50 |
} |
52 | 51 |
|
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/NamedLayerElement.java | ||
---|---|---|
1 | 1 |
package org.gvsig.sldsupport.impl.sld1_0_0.parsing; |
2 | 2 |
|
3 | 3 |
import java.io.IOException; |
4 |
import java.io.InputStream; |
|
5 | 4 |
|
6 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
7 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.constraints.SLDLayerFeatureConstraints; |
|
9 | 9 |
import org.gvsig.sldsupport.sld.layer.SLDNamedLayer; |
10 |
import org.gvsig.sldsupport.sld.style.layer.SLDNamedStyle; |
|
11 |
import org.gvsig.sldsupport.sld.style.layer.SLDUserStyle; |
|
10 | 12 |
import org.kxml2.io.KXmlParser; |
11 | 13 |
import org.xmlpull.v1.XmlPullParser; |
12 | 14 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
19 | 21 |
parser.require(KXmlParser.START_TAG, null, SLDTags.NAMEDLAYER); |
20 | 22 |
int tag = 0; |
21 | 23 |
|
22 |
SLDNamedLayer resp = null; |
|
24 |
SLDNamedLayer resp = new SLDNamedLayer(); |
|
25 |
resp.setVersion(version); |
|
23 | 26 |
|
24 |
tag = parser.next(); |
|
27 |
tag = parser.nextTag();
|
|
25 | 28 |
String name = parser.getName(); |
26 | 29 |
String txt = null; |
27 | 30 |
while (!(SLDUtils.isStr(name, SLDTags.NAMEDLAYER) && tag == KXmlParser.END_TAG)) { |
... | ... | |
30 | 33 |
case KXmlParser.START_TAG: |
31 | 34 |
if (SLDUtils.isStr(name, SLDTags.NAME)) { |
32 | 35 |
txt = parser.nextText(); |
33 |
resp = new SLDNamedLayer(txt, null, version); |
|
36 |
resp.setName(txt); |
|
37 |
parser.nextTag(); |
|
34 | 38 |
} |
39 |
|
|
40 |
if (SLDUtils.isStr(name, SLDTags.LAYER_FEATURE_CONST)) { |
|
41 |
SLDLayerFeatureConstraints cons = null; |
|
42 |
cons = LayerFeatureConstraintsElement.parse(parser, version); |
|
43 |
resp.setLayerFeatureConstraints(cons); |
|
44 |
break; |
|
45 |
} |
|
46 |
|
|
47 |
if (SLDUtils.isStr(name, SLDTags.NAMEDSTYLE)) { |
|
48 |
SLDNamedStyle ns = NamedStyleElement.parse(parser, version); |
|
49 |
resp.getStyles().add(ns); |
|
50 |
} |
|
51 |
|
|
52 |
if (SLDUtils.isStr(name, SLDTags.USERSTYLE)) { |
|
53 |
SLDUserStyle us = UserStyleElement.parse(parser, version); |
|
54 |
resp.getStyles().add(us); |
|
55 |
} |
|
56 |
|
|
35 | 57 |
break; |
36 | 58 |
case KXmlParser.END_TAG: |
37 | 59 |
break; |
38 | 60 |
case KXmlParser.TEXT: |
39 | 61 |
break; |
40 | 62 |
} |
41 |
tag = parser.next(); |
|
63 |
tag = parser.getEventType(); |
|
64 |
name = parser.getName(); |
|
42 | 65 |
} |
43 | 66 |
|
44 |
parser.next(); |
|
67 |
parser.nextTag();
|
|
45 | 68 |
return resp; |
46 | 69 |
} |
47 | 70 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/RemoteOWSElement.java | ||
---|---|---|
20 | 20 |
|
21 | 21 |
SLDRemoteOWS resp = new SLDRemoteOWS(); |
22 | 22 |
|
23 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
24 | 24 |
String name = parser.getName(); |
25 | 25 |
String txt = null; |
26 | 26 |
while (!(SLDUtils.isStr(name, SLDTags.REMOTE_OWS) && tag == KXmlParser.END_TAG)) { |
... | ... | |
30 | 30 |
if (SLDUtils.isStr(name, SLDTags.SERVICE)) { |
31 | 31 |
txt = parser.nextText(); |
32 | 32 |
resp.setService(txt); |
33 |
parser.nextTag(); |
|
33 | 34 |
break; |
34 | 35 |
} |
35 | 36 |
if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) { |
36 | 37 |
// xlink:href="http://somesite.com/something.xml" |
37 | 38 |
txt = parser.getAttributeValue("xlink", "href"); |
38 | 39 |
resp.setOnlineResource(txt); |
40 |
parser.nextTag(); |
|
41 |
parser.nextTag(); |
|
39 | 42 |
break; |
40 | 43 |
} |
41 | 44 |
break; |
... | ... | |
44 | 47 |
case KXmlParser.TEXT: |
45 | 48 |
break; |
46 | 49 |
} |
47 |
tag = parser.next(); |
|
50 |
tag = parser.getEventType(); |
|
51 |
name = parser.getName(); |
|
48 | 52 |
} |
49 |
|
|
50 |
parser.next(); |
|
53 |
parser.nextTag(); |
|
51 | 54 |
return resp; |
52 | 55 |
} |
53 | 56 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/AnchorPointElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDAnchorPoint; |
10 | 9 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue; |
11 | 10 |
import org.kxml2.io.KXmlParser; |
... | ... | |
22 | 21 |
|
23 | 22 |
SLDAnchorPoint resp = null; |
24 | 23 |
|
25 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
26 | 25 |
String name = parser.getName(); |
27 | 26 |
String txt = null; |
28 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.ANCHOR_POINT) && tag == KXmlParser.END_TAG)) { |
... | ... | |
45 | 44 |
case KXmlParser.TEXT: |
46 | 45 |
break; |
47 | 46 |
} |
48 |
tag = parser.next(); |
|
47 |
tag = parser.getEventType(); |
|
48 |
name = parser.getName(); |
|
49 | 49 |
} |
50 | 50 |
|
51 |
parser.next(); |
|
51 |
parser.nextTag();
|
|
52 | 52 |
return resp; |
53 | 53 |
} |
54 | 54 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/GraphicFillElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphic; |
10 | 9 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicFill; |
11 |
import org.gvsig.sldsupport.sld.graphic.SLDLegendGraphic; |
|
12 | 10 |
import org.kxml2.io.KXmlParser; |
13 | 11 |
import org.xmlpull.v1.XmlPullParser; |
14 | 12 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
23 | 21 |
|
24 | 22 |
SLDGraphicFill resp = new SLDGraphicFill(); |
25 | 23 |
|
26 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
27 | 25 |
String name = parser.getName(); |
28 | 26 |
String txt = null; |
29 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.GRAPHICFILL) && tag == KXmlParser.END_TAG)) { |
... | ... | |
41 | 39 |
case KXmlParser.TEXT: |
42 | 40 |
break; |
43 | 41 |
} |
44 |
tag = parser.next(); |
|
42 |
tag = parser.getEventType(); |
|
43 |
name = parser.getName(); |
|
45 | 44 |
} |
46 | 45 |
|
47 |
parser.next(); |
|
46 |
parser.nextTag();
|
|
48 | 47 |
return resp; |
49 | 48 |
} |
50 | 49 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/FilterElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.filter.DefaultSLDFilter; |
7 | 7 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.FilterOperatorElement; |
8 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.BinaryComparisonOperatorElement; |
|
9 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.IsBetweenComparisonElement; |
|
10 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.IsLikeComparisonElement; |
|
11 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.IsNullComparisonElement; |
|
12 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BBoxOperatorElement; |
|
13 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BinarySpatialOperatorElement; |
|
14 | 8 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
15 | 9 |
import org.gvsig.sldsupport.sld.SLDTags; |
16 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
17 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
|
18 | 10 |
import org.gvsig.sldsupport.sld.filter.SLDFilter; |
19 | 11 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
20 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
21 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDDistanceBufferOperator; |
|
22 | 12 |
import org.kxml2.io.KXmlParser; |
23 | 13 |
import org.xmlpull.v1.XmlPullParser; |
24 | 14 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
40 | 30 |
name = parser.getName(); |
41 | 31 |
} |
42 | 32 |
parser.require(KXmlParser.END_TAG, null, SLDTags.ELSEFILTER); |
43 |
parser.next(); |
|
33 |
parser.nextTag();
|
|
44 | 34 |
return resp; |
45 | 35 |
} |
46 | 36 |
parser.require(KXmlParser.START_TAG, null, SLDTags.FILTER); |
47 | 37 |
|
48 | 38 |
resp = new DefaultSLDFilter(); |
49 | 39 |
resp.setIsElse(false); |
50 |
parser.next(); |
|
40 |
parser.nextTag();
|
|
51 | 41 |
SLDFilterOperator operator = FilterOperatorElement.parse(parser, version); |
52 | 42 |
resp.setFilterOperator(operator); |
53 | 43 |
|
54 | 44 |
parser.require(KXmlParser.END_TAG, null, SLDTags.FILTER); |
55 |
parser.next(); |
|
45 |
parser.nextTag();
|
|
56 | 46 |
return resp; |
57 | 47 |
} |
58 | 48 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/FillElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicFill; |
9 |
import org.gvsig.sldsupport.sld.graphic.SLDMark; |
|
10 | 9 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDFill; |
11 | 10 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDSvgCssParameter; |
12 | 11 |
import org.kxml2.io.KXmlParser; |
... | ... | |
23 | 22 |
|
24 | 23 |
SLDFill resp = new SLDFill(); |
25 | 24 |
|
26 |
tag = parser.next(); |
|
25 |
tag = parser.nextTag();
|
|
27 | 26 |
String name = parser.getName(); |
28 | 27 |
String txt = null; |
29 | 28 |
String attName = null; |
... | ... | |
66 | 65 |
case KXmlParser.TEXT: |
67 | 66 |
break; |
68 | 67 |
} |
69 |
tag = parser.next(); |
|
68 |
tag = parser.getEventType(); |
|
69 |
name = parser.getName(); |
|
70 | 70 |
} |
71 | 71 |
|
72 |
parser.next(); |
|
72 |
parser.nextTag();
|
|
73 | 73 |
return resp; |
74 | 74 |
} |
75 | 75 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/MarkElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDMark; |
9 |
import org.gvsig.sldsupport.sld.ows.SLDRemoteOWS; |
|
9 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDFill; |
|
10 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDStroke; |
|
10 | 11 |
import org.kxml2.io.KXmlParser; |
11 | 12 |
import org.xmlpull.v1.XmlPullParser; |
12 | 13 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
21 | 22 |
|
22 | 23 |
SLDMark resp = new SLDMark(); |
23 | 24 |
|
24 |
tag = parser.next(); |
|
25 |
tag = parser.nextTag();
|
|
25 | 26 |
String name = parser.getName(); |
26 | 27 |
String txt = null; |
27 | 28 |
while (!(SLDUtils.isStr(name, SLDTags.MARK) && tag == KXmlParser.END_TAG)) { |
... | ... | |
32 | 33 |
txt = parser.nextText(); |
33 | 34 |
resp.setMarkType(SLDMark.MARK_TYPE_WELL_KNOWN_NAME); |
34 | 35 |
resp.setWellKnownName(txt); |
36 |
parser.nextTag(); |
|
35 | 37 |
break; |
36 | 38 |
} |
37 | 39 |
if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) { |
... | ... | |
40 | 42 |
resp.setOnlineResource(txt); |
41 | 43 |
resp.setMarkType(SLDMark.MARK_TYPE_ONLINE_RESOURCE); |
42 | 44 |
resp.setOnlineResource(txt); |
45 |
parser.nextTag(); |
|
46 |
parser.nextTag(); |
|
43 | 47 |
break; |
44 | 48 |
} |
45 | 49 |
if (SLDUtils.isStr(name, SLDTags.INLINE_CONTENT)) { |
... | ... | |
49 | 53 |
txt = parser.nextText(); |
50 | 54 |
resp.setMarkType(SLDMark.MARK_TYPE_INLINE_CONTENT); |
51 | 55 |
resp.setInlineContent(txt.getBytes()); |
56 |
parser.nextTag(); |
|
52 | 57 |
break; |
53 | 58 |
} |
54 | 59 |
if (SLDUtils.isStr(name, SLDTags.FORMAT)) { |
55 | 60 |
txt = parser.nextText(); |
56 | 61 |
resp.setFormat(txt); |
62 |
parser.nextTag(); |
|
57 | 63 |
break; |
58 | 64 |
} |
59 | 65 |
if (SLDUtils.isStr(name, SLDTags.MARK_INDEX)) { |
60 | 66 |
txt = parser.nextText(); |
61 | 67 |
int ind = SLDUtils.parseInteger(txt); |
62 | 68 |
resp.setMarkIndex(ind); |
69 |
parser.nextTag(); |
|
63 | 70 |
break; |
64 | 71 |
} |
65 | 72 |
// ============================================= |
66 | 73 |
if (SLDUtils.isStr(name, SLDTags.FILL)) { |
67 |
txt = parser.nextText();
|
|
68 |
resp.setFormat(txt);
|
|
74 |
SLDFill fil = FillElement.parse(parser, version);
|
|
75 |
resp.setFill(fil);
|
|
69 | 76 |
break; |
70 | 77 |
} |
71 |
|
|
78 |
if (SLDUtils.isStr(name, SLDTags.STROKE)) { |
|
79 |
SLDStroke stro = StrokeElement.parse(parser, version); |
|
80 |
resp.setStroke(stro); |
|
81 |
break; |
|
82 |
} |
|
72 | 83 |
break; |
73 | 84 |
case KXmlParser.END_TAG: |
74 | 85 |
break; |
75 | 86 |
case KXmlParser.TEXT: |
76 | 87 |
break; |
77 | 88 |
} |
78 |
tag = parser.next(); |
|
89 |
tag = parser.getEventType(); |
|
90 |
name = parser.getName(); |
|
79 | 91 |
} |
80 | 92 |
|
81 |
parser.next(); |
|
93 |
parser.nextTag();
|
|
82 | 94 |
return resp; |
83 | 95 |
} |
84 | 96 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/LegendGraphicElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphic; |
10 | 9 |
import org.gvsig.sldsupport.sld.graphic.SLDLegendGraphic; |
11 | 10 |
import org.kxml2.io.KXmlParser; |
... | ... | |
22 | 21 |
|
23 | 22 |
SLDLegendGraphic resp = new SLDLegendGraphic(); |
24 | 23 |
|
25 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
26 | 25 |
String name = parser.getName(); |
27 | 26 |
String txt = null; |
28 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.LEGENDGRAPHIC) |
... | ... | |
41 | 40 |
case KXmlParser.TEXT: |
42 | 41 |
break; |
43 | 42 |
} |
44 |
tag = parser.next(); |
|
43 |
tag = parser.getEventType(); |
|
44 |
name = parser.getName(); |
|
45 | 45 |
} |
46 | 46 |
|
47 |
parser.next(); |
|
47 |
parser.nextTag();
|
|
48 | 48 |
return resp; |
49 | 49 |
} |
50 | 50 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/UserStyleElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.filter.DefaultSLDFilter; |
|
7 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BBoxOperatorElement; |
|
8 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BinarySpatialOperatorElement; |
|
9 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
10 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
11 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
|
12 |
import org.gvsig.sldsupport.sld.filter.SLDFilter; |
|
13 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
|
14 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
15 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDDistanceBufferOperator; |
|
8 |
import org.gvsig.sldsupport.sld.style.SLDFeatureStyle; |
|
16 | 9 |
import org.gvsig.sldsupport.sld.style.layer.SLDUserStyle; |
17 | 10 |
import org.kxml2.io.KXmlParser; |
18 | 11 |
import org.xmlpull.v1.XmlPullParser; |
... | ... | |
27 | 20 |
int tag = 0; |
28 | 21 |
|
29 | 22 |
SLDUserStyle resp = new SLDUserStyle(); |
30 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
31 | 24 |
String name = parser.getName(); |
32 | 25 |
String txt = null; |
33 |
while (!(SLDUtils.isStr(name, SLDTags.FILTER) && tag == KXmlParser.END_TAG)) {
|
|
26 |
while (!(SLDUtils.isStr(name, SLDTags.USERSTYLE) && tag == KXmlParser.END_TAG)) {
|
|
34 | 27 |
|
35 | 28 |
switch (tag) { |
36 | 29 |
case KXmlParser.START_TAG: |
30 |
|
|
37 | 31 |
if (SLDUtils.isStr(name, SLDTags.NAME)) { |
38 | 32 |
txt = parser.nextText(); |
39 | 33 |
resp.setName(txt); |
34 |
parser.nextTag(); |
|
40 | 35 |
break; |
41 | 36 |
} |
42 | 37 |
|
38 |
if (SLDUtils.isStr(name, SLDTags.TITLE)) { |
|
39 |
txt = parser.nextText(); |
|
40 |
resp.setTile(txt); |
|
41 |
parser.nextTag(); |
|
42 |
break; |
|
43 |
} |
|
44 |
|
|
45 |
|
|
46 |
if (SLDUtils.isStr(name, SLDTags.ABSTRACT) |
|
47 |
|| SLDUtils.isStr(name, SLDTags.DESCRIPTION)) { |
|
48 |
txt = parser.nextText(); |
|
49 |
resp.setAbstract(txt); |
|
50 |
parser.nextTag(); |
|
51 |
break; |
|
52 |
} |
|
53 |
|
|
54 |
|
|
55 |
if (SLDUtils.isStr(name, SLDTags.IS_DEFAULT)) { |
|
56 |
txt = parser.nextText(); |
|
57 |
resp.setIsDefault(txt); |
|
58 |
parser.nextTag(); |
|
59 |
break; |
|
60 |
} |
|
61 |
|
|
62 |
|
|
43 | 63 |
if (SLDUtils.isStr(name, SLDTags.FEATURETYPESTYLE) // 1.0.0 |
44 | 64 |
|| SLDUtils.isStr(name, SLDTags.FEATURESTYLE)) { // 1.1.0 |
45 |
txt = parser.nextText(); |
|
46 |
resp.setName(txt); |
|
65 |
|
|
66 |
SLDFeatureStyle fsty = FeatureStyleElement.parse(parser, version); |
|
67 |
resp.getFeatureStyles().add(fsty); |
|
47 | 68 |
break; |
48 | 69 |
} |
49 | 70 |
|
... | ... | |
53 | 74 |
case KXmlParser.TEXT: |
54 | 75 |
break; |
55 | 76 |
} |
56 |
tag = parser.next(); |
|
77 |
tag = parser.getEventType(); |
|
78 |
name = parser.getName(); |
|
57 | 79 |
} |
58 | 80 |
|
59 |
parser.next(); |
|
81 |
parser.nextTag();
|
|
60 | 82 |
return resp; |
61 | 83 |
} |
62 | 84 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/FeatureTypeConstraintElement.java | ||
---|---|---|
21 | 21 |
|
22 | 22 |
SLDFeatureTypeConstraint resp = new SLDFeatureTypeConstraint(); |
23 | 23 |
|
24 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
25 | 25 |
String name = parser.getName(); |
26 | 26 |
String txt = null; |
27 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.FEATURETYPECONSTRAINT) && tag == KXmlParser.END_TAG)) { |
... | ... | |
31 | 31 |
if (SLDUtils.isStr(name, SLDTags.FEATURETYPENAME)) { |
32 | 32 |
txt = parser.nextText(); |
33 | 33 |
resp.setFeatureTypeName(txt); |
34 |
parser.nextTag(); |
|
34 | 35 |
break; |
35 | 36 |
} |
36 | 37 |
if (SLDUtils.isStr(name, SLDTags.FILTER)) { |
37 | 38 |
txt = parser.nextText(); |
38 | 39 |
resp.setFeatureTypeName(txt); |
40 |
parser.nextTag(); |
|
39 | 41 |
break; |
40 | 42 |
} |
41 | 43 |
if (SLDUtils.isStr(name, SLDTags.EXTENT)) { |
... | ... | |
49 | 51 |
case KXmlParser.TEXT: |
50 | 52 |
break; |
51 | 53 |
} |
52 |
tag = parser.next(); |
|
54 |
tag = parser.getEventType(); |
|
55 |
name = parser.getName(); |
|
53 | 56 |
} |
54 | 57 |
|
55 |
parser.next(); |
|
58 |
parser.nextTag();
|
|
56 | 59 |
return resp; |
57 | 60 |
} |
58 | 61 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/NamedStyleElement.java | ||
---|---|---|
1 |
package org.gvsig.sldsupport.impl.sld1_0_0.parsing; |
|
2 |
|
|
3 |
import java.io.IOException; |
|
4 |
|
|
5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
|
6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
|
7 |
import org.gvsig.sldsupport.sld.SLDTags; |
|
8 |
import org.gvsig.sldsupport.sld.style.SLDFeatureStyle; |
|
9 |
import org.gvsig.sldsupport.sld.style.layer.SLDNamedStyle; |
|
10 |
import org.gvsig.sldsupport.sld.style.layer.SLDUserStyle; |
|
11 |
import org.kxml2.io.KXmlParser; |
|
12 |
import org.xmlpull.v1.XmlPullParser; |
|
13 |
import org.xmlpull.v1.XmlPullParserException; |
|
14 |
|
|
15 |
public class NamedStyleElement { |
|
16 |
|
|
17 |
public static SLDNamedStyle parse(XmlPullParser parser , String version) |
|
18 |
throws XmlPullParserException, IOException, SLDReadException { |
|
19 |
|
|
20 |
parser.require(KXmlParser.START_TAG, null, SLDTags.NAMEDSTYLE); |
|
21 |
int tag = 0; |
|
22 |
|
|
23 |
SLDNamedStyle resp = new SLDNamedStyle(); |
|
24 |
tag = parser.nextTag(); |
|
25 |
String name = parser.getName(); |
|
26 |
String txt = null; |
|
27 |
while (!(SLDUtils.isStr(name, SLDTags.NAMEDSTYLE) && tag == KXmlParser.END_TAG)) { |
|
28 |
|
|
29 |
switch (tag) { |
|
30 |
case KXmlParser.START_TAG: |
|
31 |
|
|
32 |
if (SLDUtils.isStr(name, SLDTags.NAME)) { |
|
33 |
txt = parser.nextText(); |
|
34 |
resp.setName(txt); |
|
35 |
parser.nextTag(); |
|
36 |
break; |
|
37 |
} |
|
38 |
break; |
|
39 |
case KXmlParser.END_TAG: |
|
40 |
break; |
|
41 |
case KXmlParser.TEXT: |
|
42 |
break; |
|
43 |
} |
|
44 |
tag = parser.getEventType(); |
|
45 |
name = parser.getName(); |
|
46 |
} |
|
47 |
|
|
48 |
parser.nextTag(); |
|
49 |
return resp; |
|
50 |
} |
|
51 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/GraphicStrokeElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphic; |
10 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicFill; |
|
11 | 9 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicStroke; |
12 |
import org.gvsig.sldsupport.sld.graphic.SLDLegendGraphic; |
|
13 | 10 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue; |
14 | 11 |
import org.kxml2.io.KXmlParser; |
15 |
import org.slf4j.Logger; |
|
16 |
import org.slf4j.LoggerFactory; |
|
17 | 12 |
import org.xmlpull.v1.XmlPullParser; |
18 | 13 |
import org.xmlpull.v1.XmlPullParserException; |
19 | 14 |
|
... | ... | |
27 | 22 |
|
28 | 23 |
SLDGraphicStroke resp = new SLDGraphicStroke(); |
29 | 24 |
|
30 |
tag = parser.next(); |
|
25 |
tag = parser.nextTag();
|
|
31 | 26 |
String name = parser.getName(); |
32 | 27 |
String txt = null; |
33 | 28 |
while (!(SLDUtils.isStr(name, SLDTags.GRAPHICSTROKE) && tag == KXmlParser.END_TAG)) { |
... | ... | |
55 | 50 |
case KXmlParser.TEXT: |
56 | 51 |
break; |
57 | 52 |
} |
53 |
tag = parser.getEventType(); |
|
58 | 54 |
name = parser.getName(); |
59 | 55 |
} |
60 | 56 |
|
61 |
parser.next(); |
|
57 |
parser.nextTag();
|
|
62 | 58 |
return resp; |
63 | 59 |
} |
64 | 60 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/expression/ExpressionElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.filter.DefaultSLDFilter; |
|
7 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BBoxOperatorElement; |
|
8 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.BinarySpatialOperatorElement; |
|
9 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
10 |
import org.gvsig.sldsupport.sld.SLDTags; |
|
11 | 7 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
12 |
import org.gvsig.sldsupport.sld.filter.SLDFilter; |
|
13 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
|
14 | 8 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
15 | 9 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral; |
16 | 10 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDPropertyName; |
17 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
18 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDDistanceBufferOperator; |
|
19 |
import org.kxml2.io.KXmlParser; |
|
20 | 11 |
import org.xmlpull.v1.XmlPullParser; |
21 | 12 |
import org.xmlpull.v1.XmlPullParserException; |
22 | 13 |
|
... | ... | |
32 | 23 |
String txt = parser.nextText(); |
33 | 24 |
pn.setPropertyName(txt); |
34 | 25 |
// Go to next tag |
35 |
parser.next(); |
|
26 |
parser.nextTag();
|
|
36 | 27 |
return pn; |
37 | 28 |
} |
38 | 29 |
|
... | ... | |
41 | 32 |
String txt = parser.nextText(); |
42 | 33 |
lit.setValue(txt); |
43 | 34 |
// Go to next tag |
44 |
parser.next(); |
|
35 |
parser.nextTag();
|
|
45 | 36 |
return lit; |
46 | 37 |
} |
47 | 38 |
|
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/expression/FunctionElement.java | ||
---|---|---|
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
9 | 9 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
10 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDArithmeticOperator; |
|
11 | 10 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDFunction; |
12 | 11 |
import org.kxml2.io.KXmlParser; |
13 | 12 |
import org.xmlpull.v1.XmlPullParser; |
... | ... | |
23 | 22 |
SLDFunction resp = new SLDFunction(); |
24 | 23 |
resp.setFunctionName(fname); |
25 | 24 |
|
26 |
int tag = parser.next(); |
|
25 |
int tag = parser.nextTag();
|
|
27 | 26 |
String name = parser.getName(); |
28 | 27 |
SLDExpression expre = null; |
29 | 28 |
|
... | ... | |
34 | 33 |
tag = parser.getEventType(); |
35 | 34 |
name = parser.getName(); |
36 | 35 |
} |
37 |
parser.next(); |
|
36 |
parser.nextTag();
|
|
38 | 37 |
return resp; |
39 | 38 |
} |
40 | 39 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/expression/ArithmeticElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
|
7 |
import org.gvsig.sldsupport.sld.SLDTags; |
|
8 | 6 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
9 | 7 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDArithmeticOperator; |
10 |
import org.gvsig.sldsupport.sld.graphic.SLDMark; |
|
11 | 8 |
import org.kxml2.io.KXmlParser; |
12 | 9 |
import org.xmlpull.v1.XmlPullParser; |
13 | 10 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
20 | 17 |
SLDArithmeticOperator resp = new SLDArithmeticOperator(); |
21 | 18 |
String op_name = parser.getName(); |
22 | 19 |
resp.setOperatorName(op_name); |
23 |
parser.next(); |
|
20 |
parser.nextTag();
|
|
24 | 21 |
|
25 | 22 |
SLDExpression expre = null; |
26 | 23 |
expre = ExpressionElement.parse(parser, version); |
... | ... | |
29 | 26 |
resp.setSecondExpression(expre); |
30 | 27 |
|
31 | 28 |
parser.require(KXmlParser.END_TAG, null, op_name); |
32 |
parser.next(); |
|
29 |
parser.nextTag();
|
|
33 | 30 |
return resp; |
34 | 31 |
} |
35 | 32 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/ExtentElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
9 |
import org.gvsig.sldsupport.sld.layer.SLDNamedLayer; |
|
10 | 9 |
import org.kxml2.io.KXmlParser; |
11 | 10 |
import org.xmlpull.v1.XmlPullParser; |
12 | 11 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
21 | 20 |
|
22 | 21 |
SLDExtent resp = new SLDExtent(); |
23 | 22 |
|
24 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
25 | 24 |
String name = parser.getName(); |
26 | 25 |
String txt = null; |
27 | 26 |
while (!(SLDUtils.isStr(name, SLDTags.EXTENT) && tag == KXmlParser.END_TAG)) { |
... | ... | |
31 | 30 |
if (SLDUtils.isStr(name, SLDTags.NAME)) { |
32 | 31 |
txt = parser.nextText(); |
33 | 32 |
resp.setName(txt); |
33 |
parser.nextTag(); |
|
34 | 34 |
break; |
35 | 35 |
} |
36 | 36 |
if (SLDUtils.isStr(name, SLDTags.VALUE)) { |
37 | 37 |
txt = parser.nextText(); |
38 | 38 |
resp.setValue(txt); |
39 |
parser.nextTag(); |
|
39 | 40 |
break; |
40 | 41 |
} |
41 | 42 |
break; |
... | ... | |
44 | 45 |
case KXmlParser.TEXT: |
45 | 46 |
break; |
46 | 47 |
} |
47 |
tag = parser.next(); |
|
48 |
tag = parser.getEventType(); |
|
49 |
name = parser.getName(); |
|
48 | 50 |
} |
49 | 51 |
|
50 |
parser.next(); |
|
52 |
parser.nextTag();
|
|
51 | 53 |
return resp; |
52 | 54 |
} |
53 | 55 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/RuleElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.symbol.SymbolElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 | 8 |
import org.gvsig.sldsupport.sld.SLDTags; |
9 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
10 | 9 |
import org.gvsig.sldsupport.sld.filter.SLDFilter; |
11 | 10 |
import org.gvsig.sldsupport.sld.graphic.SLDLegendGraphic; |
12 | 11 |
import org.gvsig.sldsupport.sld.rule.SLDRule; |
... | ... | |
25 | 24 |
|
26 | 25 |
SLDRule resp = new SLDRule(); |
27 | 26 |
|
28 |
tag = parser.next(); |
|
27 |
tag = parser.nextTag();
|
|
29 | 28 |
String name = parser.getName(); |
30 | 29 |
String txt = null; |
31 | 30 |
while (!(SLDUtils.isStr(name, SLDTags.RULE) && tag == KXmlParser.END_TAG)) { |
... | ... | |
35 | 34 |
if (SLDUtils.isStr(name, SLDTags.NAME)) { |
36 | 35 |
txt = parser.nextText(); |
37 | 36 |
resp.setName(txt); |
37 |
parser.nextTag(); |
|
38 | 38 |
break; |
39 | 39 |
} |
40 | 40 |
if (SLDUtils.isStr(name, SLDTags.TITLE)) { |
41 | 41 |
txt = parser.nextText(); |
42 | 42 |
resp.setTitle(txt); |
43 |
parser.nextTag(); |
|
43 | 44 |
break; |
44 | 45 |
} |
45 | 46 |
if (SLDUtils.isStr(name, SLDTags.ABSTRACT) |
46 | 47 |
|| SLDUtils.isStr(name, SLDTags.DESCRIPTION)) { |
47 | 48 |
txt = parser.nextText(); |
48 | 49 |
resp.setDescription(txt); |
50 |
parser.nextTag(); |
|
49 | 51 |
break; |
50 | 52 |
} |
51 | 53 |
if (SLDUtils.isStr(name, SLDTags.LEGENDGRAPHIC)) { |
... | ... | |
64 | 66 |
if (SLDUtils.isStr(name, SLDTags.MINSCALEDENOMINATOR)) { |
65 | 67 |
txt = parser.nextText(); |
66 | 68 |
resp.setMinScaleDenominator(SLDUtils.parseDouble(txt)); |
67 |
parser.next(); |
|
69 |
parser.nextTag();
|
|
68 | 70 |
break; |
69 | 71 |
} |
70 | 72 |
if (SLDUtils.isStr(name, SLDTags.MAXSCALEDENOMINATOR)) { |
71 | 73 |
txt = parser.nextText(); |
72 | 74 |
resp.setMaxScaleDenominator(SLDUtils.parseDouble(txt)); |
73 |
parser.next(); |
|
75 |
parser.nextTag();
|
|
74 | 76 |
break; |
75 | 77 |
} |
76 | 78 |
// =================================== |
... | ... | |
96 | 98 |
case KXmlParser.TEXT: |
97 | 99 |
break; |
98 | 100 |
} |
99 |
tag = parser.next(); |
|
101 |
tag = parser.getEventType(); |
|
102 |
name = parser.getName(); |
|
100 | 103 |
} |
101 |
|
|
102 |
parser.next(); |
|
104 |
parser.nextTag(); |
|
103 | 105 |
return resp; |
104 | 106 |
} |
105 | 107 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/StrokeElement.java | ||
---|---|---|
10 | 10 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral; |
11 | 11 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicFill; |
12 | 12 |
import org.gvsig.sldsupport.sld.graphic.SLDGraphicStroke; |
13 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDFill; |
|
14 | 13 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDStroke; |
15 | 14 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDSvgCssParameter; |
16 | 15 |
import org.kxml2.io.KXmlParser; |
... | ... | |
27 | 26 |
|
28 | 27 |
SLDStroke resp = new SLDStroke(); |
29 | 28 |
|
30 |
tag = parser.next(); |
|
29 |
tag = parser.nextTag();
|
|
31 | 30 |
String name = parser.getName(); |
32 | 31 |
String txt = null; |
33 | 32 |
String attName = null; |
34 |
while (!(SLDUtils.isStr(name, SLDTags.FILL) && tag == KXmlParser.END_TAG)) { |
|
33 |
while (!(SLDUtils.isStr(name, SLDTags.STROKE) && |
|
34 |
tag == KXmlParser.END_TAG)) { |
|
35 | 35 |
|
36 | 36 |
switch (tag) { |
37 | 37 |
case KXmlParser.START_TAG: |
... | ... | |
107 | 107 |
case KXmlParser.TEXT: |
108 | 108 |
break; |
109 | 109 |
} |
110 |
tag = parser.next(); |
|
110 |
tag = parser.getEventType(); |
|
111 |
name = parser.getName(); |
|
111 | 112 |
} |
112 | 113 |
|
113 |
parser.next(); |
|
114 |
parser.nextTag();
|
|
114 | 115 |
return resp; |
115 | 116 |
} |
116 | 117 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/FilterOperatorElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.filter.DefaultSLDFilter; |
|
7 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.BinaryComparisonOperatorElement; |
8 | 7 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.IsBetweenComparisonElement; |
9 | 8 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.comparison.IsLikeComparisonElement; |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/logic/BinaryLogicOperatorElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.FilterOperatorElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
10 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
|
11 | 9 |
import org.gvsig.sldsupport.sld.filter.operator.logic.SLDBinaryLogicOperator; |
12 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
13 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
14 | 10 |
import org.kxml2.io.KXmlParser; |
15 | 11 |
import org.xmlpull.v1.XmlPullParser; |
16 | 12 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
25 | 21 |
resp.setBinaryOperatorType(txt); |
26 | 22 |
|
27 | 23 |
int tag = 0; |
28 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
29 | 25 |
String name = parser.getName(); |
30 | 26 |
SLDFilterOperator foper = null; |
31 | 27 |
|
... | ... | |
52 | 48 |
+ resp.getOperators().size()); |
53 | 49 |
} |
54 | 50 |
|
55 |
parser.next(); |
|
51 |
parser.nextTag();
|
|
56 | 52 |
return resp; |
57 | 53 |
} |
58 | 54 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/logic/UnaryLogicOperatorElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.FilterOperatorElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 |
import org.gvsig.sldsupport.sld.SLDTags; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
10 | 9 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
11 | 10 |
import org.gvsig.sldsupport.sld.filter.operator.logic.SLDUnaryLogicOperator; |
12 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
13 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
14 | 11 |
import org.kxml2.io.KXmlParser; |
15 | 12 |
import org.xmlpull.v1.XmlPullParser; |
16 | 13 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
28 | 25 |
throw new SLDReadException("Unknwon unary operator: " + op_type); |
29 | 26 |
} |
30 | 27 |
|
31 |
parser.next(); |
|
28 |
parser.nextTag();
|
|
32 | 29 |
SLDFilterOperator foper = FilterOperatorElement.parse(parser, version); |
33 | 30 |
resp.setOperator(foper); |
34 | 31 |
parser.require(KXmlParser.END_TAG, null, FilterTags.NOT); |
35 |
parser.next(); |
|
32 |
parser.nextTag();
|
|
36 | 33 |
return resp; |
37 | 34 |
} |
38 | 35 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/spatial/EnvelopeElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
8 | 8 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
9 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBBoxOperator; |
|
10 | 9 |
import org.kxml2.io.KXmlParser; |
11 | 10 |
import org.xmlpull.v1.XmlPullParser; |
12 | 11 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
21 | 20 |
|
22 | 21 |
GMLEnvelope resp = new GMLEnvelope(); |
23 | 22 |
|
24 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
25 | 24 |
String name = parser.getName(); |
26 | 25 |
String txt = null; |
27 | 26 |
while (!(SLDUtils.isStr(name, FilterTags.ENVELOPE) && tag == KXmlParser.END_TAG)) { |
... | ... | |
31 | 30 |
if (SLDUtils.isStr(name, FilterTags.LOWER_CORNER)) { |
32 | 31 |
txt = parser.nextText(); |
33 | 32 |
resp.setLowerCorner(txt); |
33 |
parser.nextTag(); |
|
34 | 34 |
break; |
35 | 35 |
} |
36 | 36 |
if (SLDUtils.isStr(name, FilterTags.UPPER_CORNER)) { |
37 | 37 |
txt = parser.nextText(); |
38 | 38 |
resp.setUpperCorner(txt); |
39 |
parser.nextTag(); |
|
39 | 40 |
break; |
40 | 41 |
} |
41 | 42 |
break; |
... | ... | |
44 | 45 |
case KXmlParser.TEXT: |
45 | 46 |
break; |
46 | 47 |
} |
47 |
tag = parser.next(); |
|
48 |
tag = parser.getEventType(); |
|
49 |
name = parser.getName(); |
|
48 | 50 |
} |
49 | 51 |
|
50 |
parser.next(); |
|
52 |
parser.nextTag();
|
|
51 | 53 |
return resp; |
52 | 54 |
} |
53 | 55 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/spatial/BinarySpatialOperatorElement.java | ||
---|---|---|
21 | 21 |
resp.setOperatorName(txt); |
22 | 22 |
|
23 | 23 |
int tag = 0; |
24 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
25 | 25 |
String name = parser.getName(); |
26 | 26 |
|
27 | 27 |
while (!(SLDUtils.isStr(name, resp.getOperatorName()) && |
... | ... | |
32 | 32 |
if (SLDUtils.isStr(name, FilterTags.PROPERTYNAME)) { |
33 | 33 |
txt = parser.nextText(); |
34 | 34 |
resp.setPropertyName(txt); |
35 |
parser.nextTag(); |
|
35 | 36 |
break; |
36 | 37 |
} |
37 | 38 |
if (SLDUtils.isStr(name, FilterTags.ENVELOPE)) { |
... | ... | |
49 | 50 |
case KXmlParser.TEXT: |
50 | 51 |
break; |
51 | 52 |
} |
52 |
tag = parser.next(); |
|
53 |
tag = parser.getEventType(); |
|
54 |
name = parser.getName(); |
|
53 | 55 |
} |
54 | 56 |
|
55 |
parser.next(); |
|
56 |
name = parser.getName(); |
|
57 |
parser.nextTag(); |
|
57 | 58 |
return resp; |
58 | 59 |
} |
59 | 60 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/spatial/BBoxOperatorElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.filter.DefaultSLDFilter; |
|
7 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 |
import org.gvsig.sldsupport.sld.SLDTags; |
|
9 | 7 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
10 |
import org.gvsig.sldsupport.sld.filter.SLDFilter; |
|
11 |
import org.gvsig.sldsupport.sld.filter.SLDFilterOperator; |
|
12 | 8 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
13 | 9 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBBoxOperator; |
14 | 10 |
import org.kxml2.io.KXmlParser; |
... | ... | |
26 | 22 |
|
27 | 23 |
SLDBBoxOperator resp = new SLDBBoxOperator(); |
28 | 24 |
|
29 |
tag = parser.next(); |
|
25 |
tag = parser.nextTag();
|
|
30 | 26 |
String name = parser.getName(); |
31 | 27 |
String txt = null; |
32 | 28 |
while (!(SLDUtils.isStr(name, FilterTags.BBOX) && tag == KXmlParser.END_TAG)) { |
... | ... | |
36 | 32 |
if (SLDUtils.isStr(name, FilterTags.PROPERTYNAME)) { |
37 | 33 |
txt = parser.nextText(); |
38 | 34 |
resp.setPropertyName(txt); |
35 |
parser.nextTag(); |
|
39 | 36 |
break; |
40 | 37 |
} |
41 | 38 |
if (SLDUtils.isStr(name, FilterTags.ENVELOPE)) { |
... | ... | |
49 | 46 |
case KXmlParser.TEXT: |
50 | 47 |
break; |
51 | 48 |
} |
52 |
tag = parser.next(); |
|
49 |
tag = parser.getEventType(); |
|
50 |
name = parser.getName(); |
|
53 | 51 |
} |
54 | 52 |
|
55 |
parser.next(); |
|
53 |
parser.nextTag();
|
|
56 | 54 |
return resp; |
57 | 55 |
} |
58 | 56 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/comparison/BinaryComparisonOperatorElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.expression.ExpressionElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
|
9 | 8 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
10 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDArithmeticOperator; |
|
11 | 9 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDBinaryComparisonOperator; |
12 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
13 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBinarySpatialOperator; |
|
14 | 10 |
import org.kxml2.io.KXmlParser; |
15 | 11 |
import org.xmlpull.v1.XmlPullParser; |
16 | 12 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
27 | 23 |
resp.setIsCaseSensitive(SLDUtils.isStr(mcase, "true")); |
28 | 24 |
|
29 | 25 |
resp.setComparisonOperator(op_name); |
30 |
parser.next(); |
|
26 |
parser.nextTag();
|
|
31 | 27 |
|
32 | 28 |
SLDExpression expre = null; |
33 | 29 |
expre = ExpressionElement.parse(parser, version); |
... | ... | |
36 | 32 |
resp.setSecondExpression(expre); |
37 | 33 |
|
38 | 34 |
parser.require(KXmlParser.END_TAG, null, op_name); |
39 |
parser.next(); |
|
35 |
parser.nextTag();
|
|
40 | 36 |
return resp; |
41 | 37 |
|
42 | 38 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/comparison/IsLikeComparisonElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.EnvelopeElement; |
|
7 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 | 7 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
9 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral; |
|
10 | 8 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDIsLikeOperator; |
11 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
12 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBBoxOperator; |
|
13 | 9 |
import org.kxml2.io.KXmlParser; |
14 | 10 |
import org.xmlpull.v1.XmlPullParser; |
15 | 11 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
24 | 20 |
|
25 | 21 |
SLDIsLikeOperator resp = new SLDIsLikeOperator(); |
26 | 22 |
|
27 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
28 | 24 |
String name = parser.getName(); |
29 | 25 |
|
30 | 26 |
String att = parser.getAttributeValue(null, "wildCard"); |
... | ... | |
43 | 39 |
if (SLDUtils.isStr(name, FilterTags.PROPERTYNAME)) { |
44 | 40 |
txt = parser.nextText(); |
45 | 41 |
resp.setPropertyName(txt); |
42 |
parser.nextTag(); |
|
46 | 43 |
break; |
47 | 44 |
} |
48 | 45 |
if (SLDUtils.isStr(name, FilterTags.LITERAL)) { |
49 | 46 |
txt = parser.nextText(); |
50 | 47 |
resp.setLiteral(txt); |
48 |
parser.nextTag(); |
|
51 | 49 |
break; |
52 | 50 |
} |
53 | 51 |
break; |
... | ... | |
56 | 54 |
case KXmlParser.TEXT: |
57 | 55 |
break; |
58 | 56 |
} |
59 |
tag = parser.next(); |
|
57 |
tag = parser.getEventType(); |
|
58 |
name = parser.getName(); |
|
60 | 59 |
} |
61 | 60 |
|
62 |
parser.next(); |
|
61 |
parser.nextTag();
|
|
63 | 62 |
return resp; |
64 | 63 |
} |
65 | 64 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/comparison/IsBetweenComparisonElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.ParameterValueElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.expression.ExpressionElement; |
8 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.EnvelopeElement; |
|
9 | 8 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
10 | 9 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
11 | 10 |
import org.gvsig.sldsupport.sld.filter.expression.SLDExpression; |
12 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral; |
|
13 | 11 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDIsBetweenOperator; |
14 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDIsLikeOperator; |
|
15 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
16 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBBoxOperator; |
|
17 | 12 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue; |
18 | 13 |
import org.kxml2.io.KXmlParser; |
19 | 14 |
import org.xmlpull.v1.XmlPullParser; |
... | ... | |
29 | 24 |
|
30 | 25 |
SLDIsBetweenOperator resp = new SLDIsBetweenOperator(); |
31 | 26 |
|
32 |
tag = parser.next(); |
|
27 |
tag = parser.nextTag();
|
|
33 | 28 |
String name = parser.getName(); |
34 | 29 |
SLDExpression expre = null; |
35 | 30 |
|
... | ... | |
62 | 57 |
break; |
63 | 58 |
} |
64 | 59 |
tag = parser.getEventType(); |
65 |
name = parser.getName();x
|
|
60 |
name = parser.getName(); |
|
66 | 61 |
} |
67 | 62 |
|
68 |
parser.next(); |
|
63 |
parser.nextTag();
|
|
69 | 64 |
return resp; |
70 | 65 |
} |
71 | 66 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/comparison/IsNullComparisonElement.java | ||
---|---|---|
3 | 3 |
import java.io.IOException; |
4 | 4 |
|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.filteroperator.spatial.EnvelopeElement; |
|
7 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
8 | 7 |
import org.gvsig.sldsupport.sld.filter.FilterTags; |
9 |
import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral; |
|
10 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDIsLikeOperator; |
|
11 | 8 |
import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDIsNullOperator; |
12 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.GMLEnvelope; |
|
13 |
import org.gvsig.sldsupport.sld.filter.operator.spatial.SLDBBoxOperator; |
|
14 | 9 |
import org.kxml2.io.KXmlParser; |
15 | 10 |
import org.xmlpull.v1.XmlPullParser; |
16 | 11 |
import org.xmlpull.v1.XmlPullParserException; |
... | ... | |
25 | 20 |
|
26 | 21 |
int tag = 0; |
27 | 22 |
String txt = null; |
28 |
tag = parser.next(); |
|
23 |
tag = parser.nextTag();
|
|
29 | 24 |
String name = parser.getName(); |
30 | 25 |
while (!(SLDUtils.isStr(name, FilterTags.PROPERTYISNULL) |
31 | 26 |
&& tag == KXmlParser.END_TAG)) { |
... | ... | |
35 | 30 |
if (SLDUtils.isStr(name, FilterTags.PROPERTYNAME)) { |
36 | 31 |
txt = parser.nextText(); |
37 | 32 |
resp.setPropertyName(txt); |
33 |
parser.nextTag(); |
|
38 | 34 |
break; |
39 | 35 |
} |
40 | 36 |
break; |
... | ... | |
43 | 39 |
case KXmlParser.TEXT: |
44 | 40 |
break; |
45 | 41 |
} |
46 |
tag = parser.next();
|
|
42 |
tag = parser.getEventType();
|
|
47 | 43 |
name = parser.getName(); |
48 | 44 |
} |
49 | 45 |
|
50 |
parser.next(); |
|
46 |
parser.nextTag();
|
|
51 | 47 |
return resp; |
52 | 48 |
} |
53 | 49 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/DisplacementElement.java | ||
---|---|---|
5 | 5 |
import org.gvsig.sldsupport.exception.SLDReadException; |
6 | 6 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
7 | 7 |
import org.gvsig.sldsupport.sld.SLDTags; |
8 |
import org.gvsig.sldsupport.sld.extent.SLDExtent; |
|
9 |
import org.gvsig.sldsupport.sld.graphic.SLDAnchorPoint; |
|
10 | 8 |
import org.gvsig.sldsupport.sld.graphic.SLDDisplacement; |
11 | 9 |
import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue; |
12 | 10 |
import org.kxml2.io.KXmlParser; |
... | ... | |
23 | 21 |
|
24 | 22 |
SLDDisplacement resp = null; |
25 | 23 |
|
26 |
tag = parser.next(); |
|
24 |
tag = parser.nextTag();
|
|
27 | 25 |
String name = parser.getName(); |
28 | 26 |
String txt = null; |
29 | 27 |
while (!(SLDUtils.isStr(name, SLDTags.DISPLACEMENT) && tag == KXmlParser.END_TAG)) { |
... | ... | |
46 | 44 |
case KXmlParser.TEXT: |
47 | 45 |
break; |
48 | 46 |
} |
49 |
tag = parser.next(); |
|
47 |
tag = parser.getEventType(); |
|
48 |
name = parser.getName(); |
|
50 | 49 |
} |
51 | 50 |
|
52 |
parser.next(); |
|
51 |
parser.nextTag();
|
|
53 | 52 |
return resp; |
54 | 53 |
} |
55 | 54 |
} |
branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/SvgCssParameterElement.java | ||
---|---|---|
6 | 6 |
import org.gvsig.sldsupport.impl.sld1_0_0.parsing.expression.ExpressionElement; |
7 | 7 |
import org.gvsig.sldsupport.impl.util.SLDUtils; |
Also available in: Unified diff