Author: nbelaevski
Date: 2009-03-17 09:45:36 -0400 (Tue, 17 Mar 2009)
New Revision: 12977
Modified:
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
Log:
https://jira.jboss.org/jira/browse/RF-6267
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2009-03-17
13:32:59 UTC (rev 12976)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsHandler.java 2009-03-17
13:45:36 UTC (rev 12977)
@@ -95,9 +95,6 @@
/** end attribute */
private TagAttribute end;
- /** rendered attribute */
- private boolean rendered = true;
-
class IterationContext {
/** Iterator for columns's tag value attribute */
@@ -468,17 +465,6 @@
}
}
- private void initRendered(FaceletContext ctx) {
- TagAttribute renderedAttribute = getAttribute("rendered");
- if (renderedAttribute != null) {
- try {
- this.rendered = (Boolean) renderedAttribute.getObject(ctx);
- } catch (ClassCastException e) {
- this.rendered = true;
- }
- }
- }
-
/*
* (non-Javadoc)
*
@@ -489,11 +475,6 @@
public void apply(FaceletContext ctx, UIComponent parent)
throws IOException, FacesException, ELException {
- initRendered(ctx);
- if(!rendered){
- return;
- }
-
IterationContext iterationContext = new IterationContext();
iterationContextLocal.set(iterationContext);
Modified: trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java
===================================================================
--- trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2009-03-17
13:32:59 UTC (rev 12976)
+++ trunk/ui/columns/src/main/java/org/richfaces/taglib/ColumnsTag.java 2009-03-17
13:45:36 UTC (rev 12977)
@@ -35,7 +35,6 @@
import javax.el.ValueExpression;
import javax.el.VariableMapper;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.webapp.UIComponentClassicTagBase;
import javax.servlet.jsp.JspException;
@@ -245,9 +244,6 @@
*/
private ValueExpression _rendered;
- /** boolean value of rendered attr */
- private boolean rendered = true;
-
/**
* SortOrder is an enumeration of the possible sort orderings. Setter for
* sortOrder
@@ -290,10 +286,6 @@
public int doStartTag() throws JspException {
pageId = getId();
- initRendered();
- if(!rendered){
- return SKIP_BODY;
- }
prepare();
if (hasNext()) {
@@ -343,9 +335,6 @@
*/
@Override
public int doEndTag() throws JspException {
- if(!rendered){
- return EVAL_PAGE;
- }
if (!atFirst()) {
return super.doEndTag();
}
@@ -687,20 +676,6 @@
}
/**
- * Extracts boolean value from index rendered
- */
- private void initRendered() {
- if (_rendered != null) {
- try {
- rendered = (Boolean) _rendered.getValue(getELContext());
- } catch (ClassCastException e) {
- rendered = true;
- }
-
- }
- }
-
- /**
* Return true if we didn't complete column's count
*
* @return