Revision 44818 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultExpressionEvaluatorManager.java
DefaultExpressionEvaluatorManager.java | ||
---|---|---|
138 | 138 |
|
139 | 139 |
@Override |
140 | 140 |
public boolean isDynamicText(String source) { |
141 |
String[] sources = StringUtils.substringsBetween(source, "<%", "%>");
|
|
141 |
String[] sources = StringUtils.substringsBetween(source, DYNAMICTEXT_STARTTAG, DYNAMICTEXT_ENDTAG);
|
|
142 | 142 |
if( ArrayUtils.isEmpty(sources) ) { |
143 | 143 |
return false; |
144 | 144 |
} |
... | ... | |
147 | 147 |
|
148 | 148 |
@Override |
149 | 149 |
public String evaluateDynamicText(SymbolTable symbolTable, String source) { |
150 |
String[] sources = StringUtils.substringsBetween(source, "<%", "%>");
|
|
150 |
String[] sources = StringUtils.substringsBetween(source, DYNAMICTEXT_STARTTAG, DYNAMICTEXT_ENDTAG);
|
|
151 | 151 |
if( ArrayUtils.isEmpty(sources) ) { |
152 | 152 |
return source; |
153 | 153 |
} |
... | ... | |
172 | 172 |
interpreter.run(code); |
173 | 173 |
values[i] = writer.toString(); |
174 | 174 |
} |
175 |
sources[i] = "<%"+sources[i]+"%>";
|
|
175 |
sources[i] = DYNAMICTEXT_STARTTAG+sources[i]+DYNAMICTEXT_ENDTAG;
|
|
176 | 176 |
} |
177 | 177 |
String output = StringUtils.replaceEach(source, sources, values); |
178 | 178 |
return output; |
Also available in: Unified diff