Author: scabanovich
Date: 2009-03-23 09:08:16 -0400 (Mon, 23 Mar 2009)
New Revision: 14286
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java
Log:
JBIDE-4071
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-03-23
04:33:13 UTC (rev 14285)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/ELParserImpl.java 2009-03-23
13:08:16 UTC (rev 14286)
@@ -152,8 +152,12 @@
case ExprStartTokenDescription.EXPR_START:
case UnaryTokenDescription.UNARY:
return readComplexExpression();
+ case StringTokenDescription.STRING:
+ LexicalToken f = lookUpNextToken(current);
+ if(f != null && f.getType() == DotTokenDescription.DOT) {
+ return readInvocationExpression();
+ }
case PrimitiveValueTokenDescription.PRIMITIVE_VALUE:
- case StringTokenDescription.STRING:
ELExpressionImpl expr = new ELValueExpressionImpl();
expr.setFirstToken(current);
expr.setLastToken(current);
@@ -186,7 +190,9 @@
}
protected ELInvocationExpressionImpl readInvocationExpression() {
- if(current == null || current.getType() != JavaNameTokenDescription.JAVA_NAME) {
+ if(current == null ||
+ (current.getType() != JavaNameTokenDescription.JAVA_NAME &&
+ current.getType() != StringTokenDescription.STRING)) {
return null;
}
ELPropertyInvocationImpl name = new ELPropertyInvocationImpl();
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java 2009-03-23
04:33:13 UTC (rev 14285)
+++
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/parser/rule/ExpressionRule.java 2009-03-23
13:08:16 UTC (rev 14286)
@@ -55,8 +55,8 @@
case EndELTokenDescription.END_EL:
return STATE_EXPECTING_EL;
case JavaNameTokenDescription.JAVA_NAME:
+ case StringTokenDescription.STRING:
return STATE_EXPECTING_CALL;
- case StringTokenDescription.STRING:
case PrimitiveValueTokenDescription.PRIMITIVE_VALUE:
return STATE_EXPECTING_OPERATION;
case ParamEndTokenDescription.PARAM_END:
Show replies by date