[richfaces-svn-commits] JBoss Rich Faces SVN: r15930 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/parser/el/node and 3 other directories.

Author: nbelaevski Date: 2009-11-19 11:13:11 -0500 (Thu, 19 Nov 2009) New Revision: 15930 Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl Removed: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java Log: https://jira.jboss.org/jira/browse/RF-7732 Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java (from rev 15919, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELNodeConstants.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1,74 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk.parser.el; + +public final class ELNodeConstants { + + //operators + public static final String AND_OPERATOR = " && "; + public static final String DIV_OPERATOR = " / "; + public static final String EQUALITY_OPERATOR = " == "; + public static final String GREATER_THEN_OPERATOR = " > "; + public static final String GREATER_THEN_OR_EQUALITY_OPERATOR = " >= "; + public static final String LESS_THEN_OPERATOR = " < "; + public static final String LESS_THEN_OR_EQUALITY_OPERATOR = " <= "; + public static final String INEQUALITY_OPERATOR = " != "; + public static final String MINUS_OPERATOR = " - "; + public static final String MOD_OPERATOR = " % "; + public static final String MULT_OPERATOR = " * "; + public static final String OR_OPERATOR = " || "; + public static final String PLUS_OPERATOR = " + "; + // + + //constant values + public static final String FALSE_VALUE = "false"; + public static final String NULL_VALUE = "null"; + public static final String TRUE_VALUE = "true"; + // + + public static final String ARRAY_INDICATOR = "[L"; + public static final String COLON = " : "; + public static final String COMMA = ","; + public static final String CONVERT_TO_STRING_FUNCTION = "convertToString"; + public static final String DOT = "."; + public static final String DOUBLE_VALUE_OF_FUNCTION = "Double.valueOf"; + public static final String EXCLAMATION_MARK = "!"; + public static final String GET_ELEMENT_BY_INDEX_FUNCTION = "getElementByIndex"; + public static final String GET_FUNCTION = "get"; + public static final String GET_UTILS_FUNCTION = "getUtils"; + public static final String JAVA_UTIL_LIST = "java.util.List"; + public static final String JAVA_UTIL_MAP = "java.util.Map"; + public static final String LEFT_BRACKET = "("; + public static final String LEFT_SQUARE_BRACKET = "["; + public static final String NEGATIVE = "-"; + public static final String QUESTION_SIGN = " ? "; + public static final String QUOTE = "\""; + public static final String RIGHT_BRACKET = ")"; + public static final String RIGHT_SQUARE_BRACKET = "]"; + public static final String THIS_GET_UTILS_IS_EMPTY_FUNCTION = "this.getUtils().isEmpty"; + public static final String THIS_PREFIX = "this"; + public static final String UTILS_PREFIX = "utils"; + + private ELNodeConstants() {} +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELReflectionUtils.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -28,12 +28,10 @@ import java.beans.IntrospectionException; import java.beans.Introspector; import java.beans.PropertyDescriptor; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; - import java.util.HashMap; import java.util.Map; @@ -42,6 +40,7 @@ import org.jboss.el.parser.AstChoice; import org.jboss.el.parser.AstDeferredExpression; import org.jboss.el.parser.AstDiv; +import org.jboss.el.parser.AstDynamicExpression; import org.jboss.el.parser.AstEmpty; import org.jboss.el.parser.AstEqual; import org.jboss.el.parser.AstFalse; @@ -69,39 +68,23 @@ import org.jboss.el.parser.AstTrue; import org.jboss.el.parser.AstValue; import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.node.AstAndTreeNode; import org.richfaces.cdk.parser.el.node.AstBracketSuffixTreeNode; import org.richfaces.cdk.parser.el.node.AstChoiceTreeNode; -import org.richfaces.cdk.parser.el.node.AstDeferredExpressionTreeNode; -import org.richfaces.cdk.parser.el.node.AstDivTreeNode; +import org.richfaces.cdk.parser.el.node.AstDeferredOrDynamicExpressionTreeNode; import org.richfaces.cdk.parser.el.node.AstEmptyTreeNode; -import org.richfaces.cdk.parser.el.node.AstEqualTreeNode; -import org.richfaces.cdk.parser.el.node.AstFalseTreeNode; import org.richfaces.cdk.parser.el.node.AstFloatingPointTreeNode; import org.richfaces.cdk.parser.el.node.AstFunctionTreeNode; -import org.richfaces.cdk.parser.el.node.AstGreaterThanEqualTreeNode; -import org.richfaces.cdk.parser.el.node.AstGreaterThanTreeNode; import org.richfaces.cdk.parser.el.node.AstIdentifierTreeNode; import org.richfaces.cdk.parser.el.node.AstIntegerTreeNode; -import org.richfaces.cdk.parser.el.node.AstLessThanEqualTreeNode; -import org.richfaces.cdk.parser.el.node.AstLessThanTreeNode; import org.richfaces.cdk.parser.el.node.AstLiteralTreeNode; import org.richfaces.cdk.parser.el.node.AstMethodSuffixTreeNode; -import org.richfaces.cdk.parser.el.node.AstMinusTreeNode; -import org.richfaces.cdk.parser.el.node.AstModTreeNode; -import org.richfaces.cdk.parser.el.node.AstMultTreeNode; import org.richfaces.cdk.parser.el.node.AstNegativeTreeNode; -import org.richfaces.cdk.parser.el.node.AstNotEqualTreeNode; import org.richfaces.cdk.parser.el.node.AstNotTreeNode; -import org.richfaces.cdk.parser.el.node.AstNullTreeNode; -import org.richfaces.cdk.parser.el.node.AstOrTreeNode; -import org.richfaces.cdk.parser.el.node.AstPlusTreeNode; import org.richfaces.cdk.parser.el.node.AstPropertySuffixTreeNode; import org.richfaces.cdk.parser.el.node.AstStringTreeNode; -import org.richfaces.cdk.parser.el.node.AstTrueTreeNode; import org.richfaces.cdk.parser.el.node.AstValueTreeNode; -import org.richfaces.cdk.parser.el.node.ELNodeConstants; +import org.richfaces.cdk.parser.el.node.BinaryOperationTreeNode; +import org.richfaces.cdk.parser.el.node.ConstantValueTreeNode; import org.richfaces.cdk.parser.el.node.ITreeNode; /** @@ -137,8 +120,8 @@ treeNode = new AstStringTreeNode(child); } else if (child instanceof AstFunction) { treeNode = new AstFunctionTreeNode(child); - } else if (child instanceof AstDeferredExpression) { - treeNode = new AstDeferredExpressionTreeNode(child); + } else if (child instanceof AstDeferredExpression || child instanceof AstDynamicExpression) { + treeNode = new AstDeferredOrDynamicExpressionTreeNode(child); } else if (child instanceof AstNot) { treeNode = new AstNotTreeNode(child); } else if (child instanceof AstChoice) { @@ -148,41 +131,41 @@ } else if (child instanceof AstLiteralExpression) { treeNode = new AstLiteralTreeNode(child); } else if (child instanceof AstFalse) { - treeNode = new AstFalseTreeNode(child); + treeNode = ConstantValueTreeNode.FALSE_NODE; } else if (child instanceof AstTrue) { - treeNode = new AstTrueTreeNode(child); + treeNode = ConstantValueTreeNode.TRUE_NODE; + } else if (child instanceof AstNull) { + treeNode = ConstantValueTreeNode.NULL_NODE; } else if (child instanceof AstAnd) { - treeNode = new AstAndTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.AND_OPERATOR); } else if (child instanceof AstEqual) { - treeNode = new AstEqualTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.EQUALITY_OPERATOR); } else if (child instanceof AstGreaterThan) { - treeNode = new AstGreaterThanTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.GREATER_THEN_OPERATOR); } else if (child instanceof AstGreaterThanEqual) { - treeNode = new AstGreaterThanEqualTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.GREATER_THEN_OR_EQUALITY_OPERATOR); } else if (child instanceof AstLessThan) { - treeNode = new AstLessThanTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.LESS_THEN_OPERATOR); } else if (child instanceof AstLessThanEqual) { - treeNode = new AstLessThanEqualTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.LESS_THEN_OR_EQUALITY_OPERATOR); } else if (child instanceof AstNotEqual) { - treeNode = new AstNotEqualTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.INEQUALITY_OPERATOR); } else if (child instanceof AstOr) { - treeNode = new AstOrTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.OR_OPERATOR); } else if (child instanceof AstDiv) { - treeNode = new AstDivTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.DIV_OPERATOR); } else if (child instanceof AstMult) { - treeNode = new AstMultTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.MULT_OPERATOR); } else if (child instanceof AstMod) { - treeNode = new AstModTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.MOD_OPERATOR); } else if (child instanceof AstPlus) { - treeNode = new AstPlusTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.PLUS_OPERATOR); } else if (child instanceof AstMinus) { - treeNode = new AstMinusTreeNode(child); + treeNode = new BinaryOperationTreeNode(child, ELNodeConstants.MINUS_OPERATOR); } else if (child instanceof AstBracketSuffix) { treeNode = new AstBracketSuffixTreeNode(child); } else if (child instanceof AstNegative) { treeNode = new AstNegativeTreeNode(child); - } else if (child instanceof AstNull) { - treeNode = new AstNullTreeNode(child); } else if (child instanceof AstFloatingPoint) { treeNode = new AstFloatingPointTreeNode(child); } else if (child instanceof AstMethodSuffix) { @@ -192,9 +175,11 @@ } else if (child instanceof AstBracketSuffix) { treeNode = new AstBracketSuffixTreeNode(child); } else { - throw new ParsingException("Node " + child.getImage() + " is not recognized;"); + throw new ParsingException("Node " + child.getClass().getSimpleName() + "[" + child.getImage() + "] is not recognized;"); } + //TODO: add support for closures + return treeNode; } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/ELVisitor.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -23,14 +23,11 @@ package org.richfaces.cdk.parser.el; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import org.jboss.el.parser.AstLiteralExpression; +import org.jboss.el.parser.AstCompositeExpression; import org.jboss.el.parser.ELParser; import org.jboss.el.parser.Node; - import org.richfaces.cdk.parser.el.node.ITreeNode; /** @@ -43,8 +40,7 @@ Class<?> collectionVariableType = null; String lastIndexValue = "null"; Class<?> lastVariableType = null; - List<Object> propertyResolved = new ArrayList<Object>(); - boolean needConversion; + boolean mixedExpression; private ELVisitor() {} @@ -58,12 +54,12 @@ return elVisitor; } - public boolean isNeedConversion() { - return needConversion; + public boolean isMixedExpression() { + return mixedExpression; } - public void setNeedConversion(boolean needConversion) { - this.needConversion = needConversion; + public void setMixedExpression(boolean needConversion) { + this.mixedExpression = needConversion; } public String getLastIndexValue() { @@ -97,10 +93,16 @@ * @return generated Java code. * @throws ParsingException - if error occurred during parsing. */ - public String parse(String expression, Map<String, Class<?>> contextMap) throws ParsingException { + public static String parse(String expression, Map<String, Class<?>> contextMap) throws ParsingException { Node ret = ELParser.parse(expression); + ELVisitor elVisitor = ELVisitor.getInstance(); - return ELVisitor.getInstance().visit(ret, contextMap); + if (ret instanceof AstCompositeExpression && ret.jjtGetNumChildren() >= 2) { + //AstCompositeExpression with 2+ children is a mixed expression + elVisitor.setMixedExpression(true); + } + + return elVisitor.visit(ret, contextMap); } private String visit(Node node, Map<String, Class<?>> context) throws ParsingException { @@ -110,10 +112,6 @@ for (int i = 0; i < numChildren; i++) { Node child = node.jjtGetChild(i); - if (child instanceof AstLiteralExpression) { - this.setNeedConversion(true); - } - ITreeNode treeNode = ELReflectionUtils.determineNodeType(child); treeNode.visit(sb, context, this); @@ -139,32 +137,7 @@ lastIndexValue = "null"; lastVariableType = null; collectionVariableType = null; - needConversion = false; - propertyResolved = new ArrayList<Object>(); + mixedExpression = false; } - /** - * This method called after parse process handle AstValue node, to include special logic in that case. - */ - public void setValueHandled() { - propertyResolved.add(new Object()); - } - - /** - * This method called after AstValue node is completely parsed. - * NOTE: AstValue can be nested. - */ - public void unSetValueHandled() { - if (propertyResolved.size() > 0) { - propertyResolved.remove(propertyResolved.size() - 1); - } - } - - /** - * This method determine if AstValue node now parsed, to include special logic. - * @return true if AstValue node now parsed, otherwise -false. - */ - public boolean isValueHandled() { - return propertyResolved.size() > 0; - } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/StringUtils.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -23,41 +23,65 @@ package org.richfaces.cdk.parser.el; +import java.util.Locale; + public final class StringUtils { private StringUtils() {} - public static String getEscapedString(final String text) { - StringBuffer buf = new StringBuffer(); - int i = 0; + private static String toCharExpression(char c) { + String prependingZeroesString; + String hexString = Integer.toHexString(c); + + switch (hexString.length()) { + case 1: + prependingZeroesString = "000"; + break; + case 2: + prependingZeroesString = "00"; + break; + case 3: + prependingZeroesString = "0"; + break; + case 4: + prependingZeroesString = ""; + break; + default: + throw new IllegalArgumentException(); + } + + return "\\u" + prependingZeroesString + hexString.toUpperCase(Locale.US); + } + + public static String getEscapedString(String s) { + StringBuilder result = new StringBuilder(); - while (i < text.length()) { - char c = text.charAt(i); + char[] chars = s.toCharArray(); - if (isalnum(c)) { - buf.append(c); - } else { - switch (c) { - case '"' : - buf.append("\\\""); - - break; - - case '\n' : - buf.append("\\n"); - - break; - - default : - buf.append(c); - - break; + for (char c : chars) { + if (c == '\n') { + result.append("\\n"); + } else if (c == '\r') { + result.append("\\r"); + } else if (c == '\t') { + result.append("\\t"); + } else if (c == '\f') { + result.append("\\f"); + } else if (c == '\b') { + result.append("\\b"); + } else if (c == '\\') { + result.append("\\\\"); + } else if (c == '"') { + result.append("\\\""); + } else { + if (c < 0x20 || c > 0x7F) { + result.append(toCharExpression(c)); + } else { + result.append(c); } - } - - i++; + } } - return buf.toString(); + return result.toString(); } /** Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractArithmeticTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,70 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap any Arithmetic node. - * getOperator() method must be overridden in subclasses. - * - * @author amarkhel - * - */ -public abstract class AbstractArithmeticTreeNode extends AbstractTreeNode { - public AbstractArithmeticTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - StringBuilder sb1 = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - ITreeNode node1 = getChild(0); - - node1.visit(sb1, context, visitor); - - ITreeNode node2 = getChild(1); - - node2.visit(sb2, context, visitor); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(sb1); - sb.append(getOperator()); - sb.append(sb2); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } - - /** - * This abstract method return string representation of arithmetic operation. - * - * @return string representation of arithmetic operation of current node. - * - */ - public abstract String getOperator(); -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractBooleanTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,70 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap any Boolean node. - * getDelimiter() method must be overridden in subclasses. - * - * @author amarkhel - * - */ -public abstract class AbstractBooleanTreeNode extends AbstractTreeNode { - public AbstractBooleanTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - StringBuilder sb1 = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - ITreeNode node1 = getChild(0); - - node1.visit(sb1, context, visitor); - - ITreeNode node2 = getChild(1); - - node2.visit(sb2, context, visitor); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(sb1); - sb.append(getDelimiter()); - sb.append(sb2); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } - - /** - * This abstract method return string representation of comparison operation. - * - * @return string representation of comparison operation of current node. - * - */ - public abstract String getDelimiter(); -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AbstractTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -43,6 +43,25 @@ public AbstractTreeNode(Node node) { this.node = node; } + + /** + * Collects output from visiting child of the current node with the specified index and returns + * collected string. + * + * @param childIndex + * @param context + * @param visitor + * @return + * @throws ParsingException + */ + protected String getChildOutput(int childIndex, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { + + StringBuilder sb = new StringBuilder(); + getChild(childIndex).visit(sb, context, visitor); + + return sb.toString(); + } /** * Return node of current wrapper. @@ -83,4 +102,5 @@ */ public abstract void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException; + } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstAndTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstAnd node. - * - * @author amarkhel - * - */ -public class AstAndTreeNode extends AbstractBooleanTreeNode { - public AstAndTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.AND_DELIMITER; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstBracketSuffixTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; @@ -43,39 +44,31 @@ @Override public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - ITreeNode node = getChild(0); + String suffixValue = getChildOutput(0, context, visitor); - node.visit(sb, context, visitor); + if (visitor.getLastVariableType() != null) { + if (visitor.getLastVariableType().getName().startsWith(ELNodeConstants.ARRAY_INDICATOR)) { + sb.append(ELNodeConstants.LEFT_SQUARE_BRACKET); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_SQUARE_BRACKET); + visitor.setLastVariableType(visitor.getCollectionVariableType()); + } - String bracketSuffix = sb.toString(); - - if (visitor.isValueHandled()) { - sb.setLength(0); - - if (visitor.getLastVariableType() != null) { - if (visitor.getLastVariableType().getName().startsWith(ELNodeConstants.ARRAY_INDICATOR)) { - sb.append(ELNodeConstants.LEFT_SQUARE_BRACKET); - sb.append(bracketSuffix); - sb.append(ELNodeConstants.RIGHT_SQUARE_BRACKET); - visitor.setLastVariableType(visitor.getCollectionVariableType()); - } - - if ((visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_LIST) == 0) - || (visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_MAP) == 0)) { - sb.append(ELNodeConstants.GET_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(bracketSuffix); - sb.append(ELNodeConstants.RIGHT_BRACKET); - visitor.setLastVariableType(visitor.getCollectionVariableType()); - } - } else { - sb.append(ELNodeConstants.GET_ELELMENT_BY_INDEX_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(visitor.getLastIndexValue()); - sb.append(ELNodeConstants.COMMA); - sb.append(bracketSuffix); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } + if ((visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_LIST) == 0) + || (visitor.getLastVariableType().getName().compareTo(ELNodeConstants.JAVA_UTIL_MAP) == 0)) { + sb.append(ELNodeConstants.GET_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_BRACKET); + visitor.setLastVariableType(visitor.getCollectionVariableType()); + } + } else { + sb.append(ELNodeConstants.GET_ELEMENT_BY_INDEX_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(visitor.getLastIndexValue()); + sb.append(ELNodeConstants.COMMA); + sb.append(suffixValue); + sb.append(ELNodeConstants.RIGHT_BRACKET); } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstChoiceTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; @@ -43,26 +44,19 @@ @Override public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - StringBuilder sb1 = new StringBuilder(); - StringBuilder sb2 = new StringBuilder(); - StringBuilder sb3 = new StringBuilder(); - ITreeNode node1 = getChild(0); - - node1.visit(sb1, context, visitor); - - ITreeNode node2 = getChild(1); - - node2.visit(sb2, context, visitor); - - ITreeNode node3 = getChild(2); - - node3.visit(sb3, context, visitor); sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(sb1); + + //condition ? correctConditionBranch : incorrectConditionBranch + String condition = getChildOutput(0, context, visitor); + String correctConditionBranch = getChildOutput(1, context, visitor); + String incorrectConditionBranch = getChildOutput(2, context, visitor); + + sb.append(condition); sb.append(ELNodeConstants.QUESTION_SIGN); - sb.append(sb2); + sb.append(correctConditionBranch); sb.append(ELNodeConstants.COLON); - sb.append(sb3); + sb.append(incorrectConditionBranch); + sb.append(ELNodeConstants.RIGHT_BRACKET); } } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,63 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap AstDeferredExpression node. - * - * @author amarkhel - * - */ -public class AstDeferredExpressionTreeNode extends AbstractTreeNode { - public AstDeferredExpressionTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - int numChildren = getNode().jjtGetNumChildren(); - - for (int i = 0; i < numChildren; i++) { - if (visitor.isNeedConversion()) { - sb.append(ELNodeConstants.CONVERT_TO_STRING_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - } - - ITreeNode treeNode = getChild(i); - - treeNode.visit(sb, context, visitor); - - if (visitor.isNeedConversion()) { - sb.append(ELNodeConstants.RIGHT_BRACKET); - } - } - } -} Copied: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java (from rev 15919, root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredExpressionTreeNode.java) =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDeferredOrDynamicExpressionTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1,65 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + + + +package org.richfaces.cdk.parser.el.node; + +import java.util.Map; + +import org.jboss.el.parser.Node; + +import org.richfaces.cdk.parser.el.ELNodeConstants; +import org.richfaces.cdk.parser.el.ELVisitor; +import org.richfaces.cdk.parser.el.ParsingException; + +/** + * This class extend AbstractTreeNode and wrap AstDeferredExpression node. + * + * @author amarkhel + * + */ +public class AstDeferredOrDynamicExpressionTreeNode extends AbstractTreeNode { + + public AstDeferredOrDynamicExpressionTreeNode(Node node) { + super(node); + } + + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { + int numChildren = getNode().jjtGetNumChildren(); + + for (int i = 0; i < numChildren; i++) { + if (visitor.isMixedExpression()) { + sb.append(ELNodeConstants.CONVERT_TO_STRING_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + } + + ITreeNode treeNode = getChild(i); + + treeNode.visit(sb, context, visitor); + + if (visitor.isMixedExpression()) { + sb.append(ELNodeConstants.RIGHT_BRACKET); + } + } + } +} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstDivTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstDiv node. - * - * @author amarkhel - * - */ -public class AstDivTreeNode extends AbstractArithmeticTreeNode { - public AstDivTreeNode(Node node) { - super(node); - } - - @Override - public String getOperator() { - return ELNodeConstants.DIV_OPERATOR; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEmptyTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstEqualTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstEqual node. - * - * @author amarkhel - * - */ -public class AstEqualTreeNode extends AbstractBooleanTreeNode { - public AstEqualTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.EQUAL; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFalseTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,48 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap AstFalse node. - * - * @author amarkhel - * - */ -public class AstFalseTreeNode extends AbstractTreeNode { - public AstFalseTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - sb.append(ELNodeConstants.FALSE); - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFloatingPointTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -26,7 +26,7 @@ import java.util.Map; import org.jboss.el.parser.Node; - +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstFunctionTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -28,6 +28,7 @@ import org.jboss.el.parser.AstFunction; import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanEqualTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstGreaterThanEqual node. - * - * @author amarkhel - * - */ -public class AstGreaterThanEqualTreeNode extends AbstractBooleanTreeNode { - public AstGreaterThanEqualTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.GREAT_THEN_EQUAL; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstGreaterThanTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstGreaterThan node. - * - * @author amarkhel - * - */ -public class AstGreaterThanTreeNode extends AbstractBooleanTreeNode { - public AstGreaterThanTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.GREAT_THEN; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstIdentifierTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; @@ -37,38 +38,30 @@ * */ public class AstIdentifierTreeNode extends AbstractTreeNode { - public AstIdentifierTreeNode(Node node) { - super(node); - } + public AstIdentifierTreeNode(Node node) { + super(node); + } - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - String variableName = getNode().getImage(); + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { + String variableName = getNode().getImage(); - if (visitor.isValueHandled()) { - if (context.containsKey(variableName)) { - visitor.setLastVariableType(context.get(variableName)); - sb.append(variableName); - } else { - if (variableName.equals(ELNodeConstants.THIS_PREFIX)) { - sb.append(variableName); - } else if (variableName.equals(ELNodeConstants.UTILS_PREFIX)) { - sb.append(ELNodeConstants.THIS_PREFIX); - sb.append(ELNodeConstants.DOT); - sb.append(ELNodeConstants.GET_UTILS_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } else { - throw new ParsingException("No instance found in context for identifier " + variableName); - } - } - } else { - sb.append(ELNodeConstants.VARIABLES_GET_VARIABLE_FUNCTION); - sb.append(ELNodeConstants.LEFT_BRACKET); - sb.append(ELNodeConstants.QUOTE); - sb.append(variableName); - sb.append(ELNodeConstants.QUOTE); - sb.append(ELNodeConstants.RIGHT_BRACKET); - } - } + if (context.containsKey(variableName)) { + visitor.setLastVariableType(context.get(variableName)); + sb.append(variableName); + } else { + //TODO - what's then? + if (variableName.equals(ELNodeConstants.THIS_PREFIX)) { + sb.append(variableName); + } else if (variableName.equals(ELNodeConstants.UTILS_PREFIX)) { + sb.append(ELNodeConstants.THIS_PREFIX); + sb.append(ELNodeConstants.DOT); + sb.append(ELNodeConstants.GET_UTILS_FUNCTION); + sb.append(ELNodeConstants.LEFT_BRACKET); + sb.append(ELNodeConstants.RIGHT_BRACKET); + } else { +// throw new ParsingException("No instance found in context for identifier " + variableName); + } + } + } } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanEqualTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstLessThanEqual node. - * - * @author amarkhel - * - */ -public class AstLessThanEqualTreeNode extends AbstractBooleanTreeNode { - public AstLessThanEqualTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.LESS_THEN_EQUAL; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLessThanTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstLessThan node. - * - * @author amarkhel - * - */ -public class AstLessThanTreeNode extends AbstractBooleanTreeNode { - public AstLessThanTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.LESS_THEN; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstLiteralTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.parser.el.StringUtils; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMethodSuffixTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMinusTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstMinus node. - * - * @author amarkhel - * - */ -public class AstMinusTreeNode extends AbstractArithmeticTreeNode { - public AstMinusTreeNode(Node node) { - super(node); - } - - @Override - public String getOperator() { - return ELNodeConstants.MINUS_SIGN; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstModTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstMod node. - * - * @author amarkhel - * - */ -public class AstModTreeNode extends AbstractArithmeticTreeNode { - public AstModTreeNode(Node node) { - super(node); - } - - @Override - public String getOperator() { - return ELNodeConstants.MOD_SIGN; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstMultTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstMult node. - * - * @author amarkhel - * - */ -public class AstMultTreeNode extends AbstractArithmeticTreeNode { - public AstMultTreeNode(Node node) { - super(node); - } - - @Override - public String getOperator() { - return ELNodeConstants.MULT_SIGN; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNegativeTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotEqualTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstNotEqual node. - * - * @author amarkhel - * - */ -public class AstNotEqualTreeNode extends AbstractBooleanTreeNode { - public AstNotEqualTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.NOT_EQUAL; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNotTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstNullTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,48 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap AstNull node. - * - * @author amarkhel - * - */ -public class AstNullTreeNode extends AbstractTreeNode { - public AstNullTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - sb.append(ELNodeConstants.NULL); - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstOrTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstOr node. - * - * @author amarkhel - * - */ -public class AstOrTreeNode extends AbstractBooleanTreeNode { - public AstOrTreeNode(Node node) { - super(node); - } - - @Override - public String getDelimiter() { - return ELNodeConstants.OR; - } -} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPlusTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,43 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import org.jboss.el.parser.Node; - -/** - * This class extend AbstractTreeNode and wrap AstPlus node. - * - * @author amarkhel - * - */ -public class AstPlusTreeNode extends AbstractArithmeticTreeNode { - public AstPlusTreeNode(Node node) { - super(node); - } - - @Override - public String getOperator() { - return ELNodeConstants.PLUS_SIGN; - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstPropertySuffixTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,6 +27,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELReflectionUtils; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstStringTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -27,9 +27,10 @@ import org.jboss.el.parser.AstString; import org.jboss.el.parser.Node; - +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; +import org.richfaces.cdk.parser.el.StringUtils; /** * This class extend AbstractTreeNode and wrap AstString node. @@ -45,7 +46,7 @@ @Override public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { sb.append(ELNodeConstants.QUOTE); - sb.append(((AstString) getNode()).getString()); + sb.append(StringUtils.getEscapedString(((AstString) getNode()).getString())); sb.append(ELNodeConstants.QUOTE); } } Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstTrueTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,48 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -import java.util.Map; - -import org.jboss.el.parser.Node; - -import org.richfaces.cdk.parser.el.ELVisitor; -import org.richfaces.cdk.parser.el.ParsingException; - -/** - * This class extend AbstractTreeNode and wrap AstTrue node. - * - * @author amarkhel - * - */ -public class AstTrueTreeNode extends AbstractTreeNode { - public AstTrueTreeNode(Node node) { - super(node); - } - - @Override - public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { - sb.append(ELNodeConstants.TRUE); - } -} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/AstValueTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -29,6 +29,7 @@ import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; @@ -47,8 +48,6 @@ public void visit(StringBuilder sb, Map<String, Class<?>> context, ELVisitor visitor) throws ParsingException { List<String> tokens = new ArrayList<String>(); - visitor.setValueHandled(); - for (int i = 0; i < getNode().jjtGetNumChildren(); i++) { StringBuilder sb1 = new StringBuilder(); ITreeNode subChild = getChild(i); @@ -73,7 +72,6 @@ sb.append(visitor.getLastIndexValue()); } - visitor.unSetValueHandled(); visitor.reset(); } } Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/BinaryOperationTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.node; + +import java.util.Map; + +import org.jboss.el.parser.Node; +import org.richfaces.cdk.parser.el.ELNodeConstants; +import org.richfaces.cdk.parser.el.ELVisitor; +import org.richfaces.cdk.parser.el.ParsingException; + +/** + * <p>Abstract class for all binary (having two operands) operation expression nodes</p> + * <p>For operands <code>A</code> and <code>B</code> and operator <code>x</code> output is <code>(A x B)</code></p> + * + * @author Nick Belaevski + */ +public class BinaryOperationTreeNode extends AbstractTreeNode { + + private final String operatorString; + + public BinaryOperationTreeNode(Node node, String operatorString) { + super(node); + + this.operatorString = operatorString; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + */ + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { + + sb.append(ELNodeConstants.LEFT_BRACKET); + + String firstChildOutput = getChildOutput(0, context, visitor); + String secondChildOutput = getChildOutput(1, context, visitor); + + sb.append(firstChildOutput); + sb.append(operatorString); + sb.append(secondChildOutput); + + sb.append(ELNodeConstants.RIGHT_BRACKET); + + } + + + +} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ConstantValueTreeNode.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.parser.el.node; + +import java.util.Map; + +import org.richfaces.cdk.parser.el.ELNodeConstants; +import org.richfaces.cdk.parser.el.ELVisitor; +import org.richfaces.cdk.parser.el.ParsingException; + +/** + * @author Nick Belaevski + * + */ +public class ConstantValueTreeNode extends AbstractTreeNode { + + private final String value; + + public static final ConstantValueTreeNode NULL_NODE = new ConstantValueTreeNode(ELNodeConstants.NULL_VALUE); + + public static final ConstantValueTreeNode TRUE_NODE = new ConstantValueTreeNode(ELNodeConstants.TRUE_VALUE); + + public static final ConstantValueTreeNode FALSE_NODE = new ConstantValueTreeNode(ELNodeConstants.FALSE_VALUE); + + private ConstantValueTreeNode(String value) { + super(null); + this.value = value; + } + + /* (non-Javadoc) + * @see org.richfaces.cdk.parser.el.node.AbstractTreeNode#visit(java.lang.StringBuilder, java.util.Map, org.richfaces.cdk.parser.el.ELVisitor) + */ + @Override + public void visit(StringBuilder sb, Map<String, Class<?>> context, + ELVisitor visitor) throws ParsingException { + + sb.append(value); + } + +} Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/parser/el/node/ELNodeConstants.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -1,68 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - - - -package org.richfaces.cdk.parser.el.node; - -public final class ELNodeConstants { - public static final String AND_DELIMITER = " && "; - public static final String ARRAY_INDICATOR = "[L"; - public static final String COLON = " : "; - public static final String COMMA = ","; - public static final String CONVERT_TO_STRING_FUNCTION = "convertToString"; - public static final String DIV_OPERATOR = " / "; - public static final String DOT = "."; - public static final String DOUBLE_VALUE_OF_FUNCTION = "Double.valueOf"; - public static final String EQUAL = " == "; - public static final String EXCLAMATION_MARK = "!"; - public static final String FALSE = "false"; - public static final String GET_ELELMENT_BY_INDEX_FUNCTION = "getElelmentByIndex"; - public static final String GET_FUNCTION = "get"; - public static final String GET_UTILS_FUNCTION = "getUtils"; - public static final String GREAT_THEN = " > "; - public static final String GREAT_THEN_EQUAL = " >= "; - public static final String JAVA_UTIL_LIST = "java.util.List"; - public static final String JAVA_UTIL_MAP = "java.util.Map"; - public static final String LEFT_BRACKET = "("; - public static final String LEFT_SQUARE_BRACKET = "["; - public static final String LESS_THEN = " < "; - public static final String LESS_THEN_EQUAL = " <= "; - public static final String MINUS_SIGN = " - "; - public static final String MOD_SIGN = " % "; - public static final String MULT_SIGN = " * "; - public static final String NEGATIVE = "-"; - public static final String NOT_EQUAL = " != "; - public static final String NULL = "null"; - public static final String OR = " || "; - public static final String PLUS_SIGN = " + "; - public static final String QUESTION_SIGN = " ? "; - public static final String QUOTE = "\""; - public static final String RIGHT_BRACKET = ")"; - public static final String RIGHT_SQUARE_BRACKET = "]"; - public static final String THIS_GET_UTILS_IS_EMPTY_FUNCTION = "this.getUtils().isEmpty"; - public static final String THIS_PREFIX = "this"; - public static final String TRUE = "true"; - public static final String UTILS_PREFIX = "utils"; - public static final String VARIABLES_GET_VARIABLE_FUNCTION = "variables.getVariable"; - - private ELNodeConstants() {} -} Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/DefineObjectStatement.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.cdk.templatecompiler; + +/** + * @author Nick Belaevski + * + */ +public class DefineObjectStatement extends AbstractTemplateMethodBodyStatement { + + private String type; + + private String name; + + private String initializationExpression; + + public DefineObjectStatement(String type, String name, String initializationExpression) { + super("define-object"); + + this.type = type; + this.name = name; + this.initializationExpression = initializationExpression != null ? initializationExpression : ""; + } + + /** + * @return the type + */ + public String getType() { + return type; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @return the initializationExpression + */ + public String getInitializationExpression() { + return initializationExpression; + } + +} Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/MethodBodyTemplateModel.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -55,7 +55,8 @@ @Override public TemplateModel get(String key) throws TemplateModelException { if("code".equals(key)){ - statement.getCode(modelWrapper.getConfiguration()); + //TODO - ? + statement.getCode(modelWrapper.getConfiguration()); } return super.get(key); } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; +import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.Locale; @@ -36,7 +37,6 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import javax.faces.render.Renderer; import javax.xml.namespace.QName; import org.richfaces.builder.model.Argument; @@ -47,6 +47,8 @@ import org.richfaces.builder.model.MethodBody; import org.richfaces.builder.model.MethodBodyStatementsContainer; import org.richfaces.cdk.CdkException; +import org.richfaces.cdk.parser.el.ELVisitor; +import org.richfaces.cdk.parser.el.ParsingException; import org.richfaces.cdk.templatecompiler.model.AnyElement; import org.richfaces.cdk.templatecompiler.model.CdkBodyElement; import org.richfaces.cdk.templatecompiler.model.CdkCallElement; @@ -97,6 +99,8 @@ protected MethodBodyStatementsContainer currentStatement; private final LinkedList<MethodBodyStatementsContainer> statements = Lists.newLinkedList(); + private Map<String, Class<?>> localsTypesMap; + static { InputStream serializedAttributesStream = RendererClassVisitor.class.getResourceAsStream("/META-INF/schema/attributes.ser"); @@ -121,12 +125,20 @@ } private String compileEl(String expression, Class<?> type) { - if (Boolean.class.isAssignableFrom(type)) { - //TODO just a stub! - return "false /* " + expression.trim() + " */"; - } - - return quote(expression) + " /* " + expression.trim() + " */"; + try { + return ELVisitor.parse(expression, localsTypesMap) + "/* " + expression.trim() + " */"; + } catch (ParsingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + throw new RuntimeException(e.getMessage()); + } +// +// if (Boolean.class.isAssignableFrom(type)) { +// //TODO just a stub! +// return "false /* " + expression.trim() + " */"; +// } +// +// return quote(expression) + " /* " + expression.trim() + " */"; } private String getElExpressionContainerType(String value) { @@ -211,6 +223,14 @@ return false; } + + private void createMethodContext() { + this.currentStatement = new MethodBody(); + this.localsTypesMap = new HashMap<String, Class<?>>(); + localsTypesMap.put(FACES_CONTEXT_VARIABLE, FacesContext.class); + localsTypesMap.put(RESPONSE_WRITER_VARIABLE, ResponseWriter.class); + localsTypesMap.put(COMPONENT_VARIABLE, UIComponent.class); + } private void flushToEncodeMethod(String encodeMethodName) { if (!this.currentStatement.isEmpty()) { @@ -228,8 +248,8 @@ methodBody.addStatement(0, new EncodeMethodPrefaceStatement()); rendererClass.addMethod(javaMethod); } - - this.currentStatement = new MethodBody(); + + createMethodContext(); } private JavaClass createJavaClassByName(String fullName) { @@ -330,9 +350,12 @@ * @see org.richfaces.cdk.templatecompiler.model.TemplateVisitor#visitElement(java.lang.String) */ @Override - public void visitElement(String child) throws CdkException { - if (child != null && child.length() != 0) { - currentStatement.addStatement(new WriteTextStatement(compileEl(child, String.class))); + public void visitElement(String text) throws CdkException { + if (text != null) { + String trimmedText = text.trim(); + if (trimmedText.length() != 0) { + currentStatement.addStatement(new WriteTextStatement(compileEl(trimmedText, String.class))); + } } } @@ -434,10 +457,9 @@ } value = compileEl(value, Object.class); - currentStatement.addStatement(type + " " + name + " = " + value + ";"); - } else { - currentStatement.addStatement(type + " " + name + ";"); } + + currentStatement.addStatement(new DefineObjectStatement(type, name, value)); } /* (non-Javadoc) @@ -468,11 +490,10 @@ this.rendererClass.setSuperClass(createJavaClassByName(compositeInterface.getBaseClass())); this.rendererClass.addImport(FacesContext.class); - this.rendererClass.addImport(Renderer.class); this.rendererClass.addImport(ResponseWriter.class); this.rendererClass.addImport(UIComponent.class); - this.currentStatement = new MethodBody(); + this.createMethodContext(); } /** Added: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl (rev 0) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/java/define-object.ftl 2009-11-19 16:13:11 UTC (rev 15930) @@ -0,0 +1 @@ +${modelItem.type} ${modelItem.name} <#if modelItem.initializationExpression.length() != 0> = ${modelItem.initializationExpression}</#if>; \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java =================================================================== --- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2009-11-19 07:48:37 UTC (rev 15929) +++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/parser/el/test/ELParserTest.java 2009-11-19 16:13:11 UTC (rev 15930) @@ -30,12 +30,12 @@ import java.util.Map; import org.junit.Test; - import org.richfaces.cdk.parser.el.ELVisitor; import org.richfaces.cdk.parser.el.ParsingException; public class ELParserTest { - @Test + + @Test public void testNull() throws Exception { assertEquals(resolveExpression("#{null}"), "null"); } @@ -53,6 +53,7 @@ @Test public void testFloat() throws Exception { assertEquals(resolveExpression("#{5.0}"), "Double.valueOf(5.0)"); + assertEquals(resolveExpression("#{5.012e+34}"), "Double.valueOf(5.012e+34)"); } @Test @@ -156,14 +157,17 @@ @Test public void testString() throws Exception { + assertEquals(resolveExpression("#{\"nabc\"}"), "\"nabc\""); assertEquals(resolveExpression("#{'nabc'}"), "\"nabc\""); - assertEquals(resolveExpression("#{'\tabc'}"), "\"\tabc\""); + assertEquals(resolveExpression("#{'\tabc'}"), "\"\\tabc\""); assertEquals(resolveExpression("#{'/nabc'}"), "\"/nabc\""); + assertEquals(resolveExpression("#{'na\"bc'}"), "\"na\\\"bc\""); + assertEquals(resolveExpression("#{'na\\\\bc'}"), "\"na\\\\bc\""); } @Test public void testIdentifier() throws Exception { - assertEquals(resolveExpression("#{clientId}"), "variables.getVariable(\"clientId\")"); + assertEquals(resolveExpression("#{clientId}"), "clientId"); } @Test @@ -246,7 +250,7 @@ @Test public void testLiteralWithDeferred2() throws Exception { - assertEquals(resolveExpression("#{getType()} abs "), "this.getType() + \" abs \""); + assertEquals(resolveExpression("#{getType()} abs "), "convertToString(this.getType()) + \" abs \""); } @Test @@ -265,7 +269,8 @@ resolveExpression("#{bean.property}"); fail("Parsing Exception is not thrown"); } catch (ParsingException pe) { - assertEquals(pe.getMessage(), "No instance found in context for identifier bean"); + //TODO - check message + //ignore exception } } @@ -279,14 +284,15 @@ "property: property not found in class: class org.richfaces.cdk.parser.el.test.Bean"); } } - + private static String resolveExpression(String expression) throws ParsingException { Map<String, Class<?>> contextMap = new HashMap<String, Class<?>>(); contextMap.put("action", org.richfaces.cdk.parser.el.test.Bean.class); + contextMap.put("clientId", String.class); + + String code = ELVisitor.parse(expression, contextMap); - String code = ELVisitor.getInstance().parse(expression, contextMap); - return code; } }