Author: andrei_exadel Date: 2008-03-20 10:52:19 -0400 (Thu, 20 Mar 2008) New Revision: 7006 Modified: trunk/ui/columns/src/main/config/component/columns.xml trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java Log: RF-2476,RF-2481 Modified: trunk/ui/columns/src/main/config/component/columns.xml =================================================================== --- trunk/ui/columns/src/main/config/component/columns.xml 2008-03-20 14:43:34 UTC (rev 7005) +++ trunk/ui/columns/src/main/config/component/columns.xml 2008-03-20 14:52:19 UTC (rev 7006) @@ -60,5 +60,13 @@ The last iteration item </description> </property> + <property hidden="true"> + <name>rows</name> + <classname>java.lang.Object</classname> + </property> + <property hidden="true"> + <name>first</name> + <classname>java.lang.Object</classname> + </property> </component> </components> Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java =================================================================== --- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-03-20 14:43:34 UTC (rev 7005) +++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2008-03-20 14:52:19 UTC (rev 7006) @@ -6,7 +6,6 @@ package org.richfaces.taglib; -import java.beans.FeatureDescriptor; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collection; @@ -14,37 +13,29 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.el.ELContext; import javax.el.ELException; import javax.el.ELResolver; -import javax.el.ExpressionFactory; import javax.el.FunctionMapper; import javax.el.MethodExpression; -import javax.el.PropertyNotFoundException; import javax.el.ValueExpression; import javax.el.VariableMapper; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.webapp.UIComponentClassicTagBase; +import javax.faces.webapp.UIComponentTag; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspTagException; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyContent; import javax.servlet.jsp.tagext.IterationTag; -import org.jaxen.expr.Expr; import org.richfaces.component.UIColumn; import org.richfaces.iterator.ForEachIterator; import org.richfaces.iterator.SimpleForEachIterator; -import org.richfaces.model.Ordering; -import com.sun.el.lang.ELSupport; -import com.sun.el.lang.EvaluationContext; -import com.sun.faces.el.ELContextImpl; - /** * Class provides implementation for columns tag * @@ -1320,219 +1311,3 @@ } } - -class ELContextWraper extends ELContext { - - VariableMapper vm; - - public ELContextWraper() { - // TODO Auto-generated constructor stub - } - - public ELContextWraper(ELResolver resolver) { - - } - - @Override - public VariableMapper getVariableMapper() { - // TODO Auto-generated method stub - return vm; - } - - @Override - public ELResolver getELResolver() { - // TODO Auto-generated method stub - return null; - } - - @Override - public FunctionMapper getFunctionMapper() { - // TODO Auto-generated method stub - return null; - } -}; - -class VariableWraper extends VariableMapper { - - @Override - public ValueExpression resolveVariable(String variable) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ValueExpression setVariable(String variable, - ValueExpression expression) { - // TODO Auto-generated method stub - return null; - } - -} - -class ValueExpressioWraper extends ValueExpression { - - ValueExpression expression; - - ValueExpression value; - - // Object value; - - int i = 0; - - public ValueExpressioWraper(ValueExpression e, ValueExpression v) { - expression = e; - value = v; - } - - private ELContext createElContext(final ELContext arg0) { - return new ELContext() { - - @Override - public Object getContext(Class key) { - // TODO Auto-generated method stub - return arg0.getContext(key); - } - - @Override - public ELResolver getELResolver() { - return arg0.getELResolver(); - } - - @Override - public FunctionMapper getFunctionMapper() { - return arg0.getFunctionMapper(); - } - - @Override - public VariableMapper getVariableMapper() { - // return arg0.getVariableMapper(); - return new VariableMapper() { - - @Override - public ValueExpression resolveVariable(String variable) { - if ("col".equals(variable)) { - return value; - } else { - return arg0.getVariableMapper().resolveVariable( - variable); - } - } - - @Override - public ValueExpression setVariable(String variable, - ValueExpression expression) { - return arg0.getVariableMapper().setVariable(variable, - expression); - } - - }; - // return arg0.getVariableMapper(); - } - - }; - } - - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#getExpectedType() - */ - @Override - public Class<?> getExpectedType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Class<?> getType(ELContext arg0) throws NullPointerException, - PropertyNotFoundException, ELException { - return expression.getType(arg0); - } - - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#getValue(javax.el.ELContext) - */ - @Override - public Object getValue(ELContext context) { - ELContext context2 = createElContext(context); - ValueExpression variable = context.getVariableMapper().resolveVariable( - "col"); - // context2.getVariableMapper().setVariable("col", value); - try { - return expression.getValue(context2); - } finally { - // context2.getVariableMapper().setVariable("col", variable); - } - // return expression.getValue(createElContext(context)); - - } - - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext) - */ - @Override - public boolean isReadOnly(ELContext context) { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.el.ValueExpression#setValue(javax.el.ELContext, - * java.lang.Object) - */ - @Override - public void setValue(ELContext context, Object value) { - expression.setValue(context, value); - } - - /* - * (non-Javadoc) - * - * @see javax.el.Expression#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * - * @see javax.el.Expression#getExpressionString() - */ - @Override - public String getExpressionString() { - // TODO Auto-generated method stub - return null; - } - - /* - * (non-Javadoc) - * - * @see javax.el.Expression#hashCode() - */ - @Override - public int hashCode() { - // TODO Auto-generated method stub - return 0; - } - - /* - * (non-Javadoc) - * - * @see javax.el.Expression#isLiteralText() - */ - @Override - public boolean isLiteralText() { - // TODO Auto-generated method stub - return false; - } - -} \ No newline at end of file