Small refactoring

This commit is contained in:
Sergey
2017-02-28 13:46:21 -08:00
committed by Juan Martín Sotuyo Dodero
parent 18a2480dc9
commit 595f398525

View File

@ -114,7 +114,9 @@ public class VfUnescapeElRule extends AbstractVfRule {
if (expression != null) {
final ASTLiteral literal = expression.getFirstChildOfType(ASTLiteral.class);
if (literal != null && literal.jjtGetChildIndex() == 0) {
if (literal.getImage().startsWith("'/") || literal.getImage().startsWith("\"/") || literal.getImage().toLowerCase().startsWith("'http") || literal.getImage().toLowerCase().startsWith("\"http") ) {
if (literal.getImage().startsWith("'/") || literal.getImage().startsWith("\"/")
|| literal.getImage().toLowerCase().startsWith("'http")
|| literal.getImage().toLowerCase().startsWith("\"http")) {
return true;
}
}
@ -212,11 +214,17 @@ public class VfUnescapeElRule extends AbstractVfRule {
break;
}
if ("$ObjectType".equalsIgnoreCase(id.getImage()) || "$Label".equalsIgnoreCase(id.getImage()) || "$Resource".equalsIgnoreCase(id.getImage())
|| "URLFOR".equalsIgnoreCase(id.getImage()) || "$Site".equalsIgnoreCase(id.getImage())
|| "$Page".equalsIgnoreCase(id.getImage())) {
switch (id.getImage().toLowerCase()) {
case "$component":
case "$objecttype":
case "$label":
case "$resource":
case "urlfor":
case "$site":
case "$page":
isEscaped = true;
continue;
default:
isEscaped = false;
}
if (e.equals(ESCAPING.ANY)) {