Revision 40749 branches/v02_desarrollo/libraries/org.gvsig.sldsupport/org.gvsig.sldsupport.lib/org.gvsig.sldsupport.lib.api/src/main/java/org/gvsig/sldsupport/filterencoding/FExpression.java
FExpression.java | ||
---|---|---|
45 | 45 |
import java.util.Set; |
46 | 46 |
|
47 | 47 |
import org.gvsig.sldsupport.exception.SLDReadException; |
48 |
import org.gvsig.sldsupport.util.SLDUtils; |
|
48 | 49 |
import org.xmlpull.v1.XmlPullParser; |
49 | 50 |
import org.xmlpull.v1.XmlPullParserException; |
50 | 51 |
|
... | ... | |
91 | 92 |
case XmlPullParser.START_TAG: |
92 | 93 |
|
93 | 94 |
if (parser.getName().compareTo( |
94 |
/*FilterUtils.remNameSpace*/(FilterTags.PROPERTYNAME))==0) {
|
|
95 |
FilterUtils.remNameSpace(FilterTags.PROPERTYNAME))==0) {
|
|
95 | 96 |
this.propertyName = parser.nextText(); |
96 | 97 |
fieldNames.add(this.propertyName); |
97 | 98 |
isPropertyName = true; |
... | ... | |
99 | 100 |
expressionStr +="["+this.propertyName +"] "; |
100 | 101 |
} |
101 | 102 |
else if (parser.getName().compareTo( |
102 |
/*FilterUtils.remNameSpace*/(FilterTags.LITERAL))==0) {
|
|
103 |
FilterUtils.remNameSpace(FilterTags.LITERAL))==0) {
|
|
103 | 104 |
this.literal = parser.nextText(); |
104 | 105 |
String myLiteral = this.literal; |
105 | 106 |
if (!this.literal.startsWith("#")) |
... | ... | |
118 | 119 |
end = true; |
119 | 120 |
expressionStr += myLiteral +" "; |
120 | 121 |
} |
121 |
else if (parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.FUNCTION))==0) {
|
|
122 |
else if (parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.FUNCTION))==0) {
|
|
122 | 123 |
this.function = parser.nextText(); |
123 | 124 |
end = true; |
124 | 125 |
} |
125 |
else if ((parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.ADD))==0) ||
|
|
126 |
(parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.DIV))==0) ||
|
|
127 |
(parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.MULT))==0) ||
|
|
128 |
(parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.SUB))==0) ){
|
|
126 |
else if ((parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.ADD))==0) ||
|
|
127 |
(parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.DIV))==0) ||
|
|
128 |
(parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.MULT))==0) ||
|
|
129 |
(parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.SUB))==0) ){
|
|
129 | 130 |
|
130 | 131 |
String operation = parser.getName(); |
131 | 132 |
currentTag = parser.nextTag(); |
... | ... | |
157 | 158 |
|
158 | 159 |
break; |
159 | 160 |
case XmlPullParser.END_TAG: |
160 |
if (parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.PROPERTYNAME))!=0 &&
|
|
161 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.LITERAL))!=0 &&
|
|
162 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.FUNCTION))!=0 &&
|
|
163 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.ADD))!=0 &&
|
|
164 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.DIV))!=0 &&
|
|
165 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.MULT))!=0 &&
|
|
166 |
parser.getName().compareTo(/*FilterUtils.remNameSpace*/(FilterTags.SUB))!=0) {
|
|
161 |
if (parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.PROPERTYNAME))!=0 &&
|
|
162 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.LITERAL))!=0 &&
|
|
163 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.FUNCTION))!=0 &&
|
|
164 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.ADD))!=0 &&
|
|
165 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.DIV))!=0 &&
|
|
166 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.MULT))!=0 &&
|
|
167 |
parser.getName().compareTo(FilterUtils.remNameSpace(FilterTags.SUB))!=0) {
|
|
167 | 168 |
end = true; |
168 | 169 |
} |
169 | 170 |
break; |
Also available in: Unified diff