Author: jkuhnert
Date: Sat Nov 25 15:42:40 2006
New Revision: 479234
URL: http://svn.apache.org/viewvc?view=rev&rev=479234
Log:
Updated contrib table use of For to match new renderTag default.
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableRows.jwc
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumns.jwc
Sat Nov 25 15:42:40 2006
@@ -51,6 +51,7 @@
<binding name="source" value="ognl:tableColumnIterator"/>
<binding name="value" value="ognl:tableColumn"/>
<binding name="volatile" value="true"/>
+ <binding name="renderTag" value="false" />
</component>
<component id="informal" type="Any" inherit-informal-parameters="yes">
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
Sat Nov 25 15:42:40 2006
@@ -71,6 +71,7 @@
<binding name="source" expression="pageList"/>
<binding name="value" expression="displayPage"/>
<binding name="volatile" expression="true"/>
+ <binding name="renderTag" value="false" />
</component>
<component id="insertCurrentPage" type="Insert">
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TablePages.jwc
Sat Nov 25 15:42:40 2006
@@ -50,6 +50,7 @@
<component id="iterPage" type="For">
<binding name="source" expression="pageList"/>
<binding name="value" expression="displayPage"/>
+ <binding name="renderTag" expression="false" />
</component>
<component id="insertCurrentPage" type="Insert">
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableRows.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableRows.jwc?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableRows.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableRows.jwc
Sat Nov 25 15:42:40 2006
@@ -101,6 +101,7 @@
<binding name="value" value="tableRow"/>
<binding name="index" value="tableIndex"/>
<binding name="fullSource" value="fullSource"/>
+ <binding name="renderTag" value="false" />
<inherited-binding name="keyExpression"
parameter-name="keyExpression"/>
<inherited-binding name="defaultValue"
parameter-name="defaultValue"/>
<inherited-binding name="converter" parameter-name="converter"/>
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/components/TableValues.jwc
Sat Nov 25 15:42:40 2006
@@ -44,6 +44,7 @@
<binding name="source" value="ognl:tableColumnIterator"/>
<binding name="value" value="ognl:tableColumn"/>
<binding name="volatile" value="true"/>
+ <binding name="renderTag" value="false" />
</component>
<component id="informal" type="Any" inherit-informal-parameters="yes">
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java?view=diff&rev=479234&r1=479233&r2=479234
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/ForBean.java
Sat Nov 25 15:42:40 2006
@@ -31,6 +31,7 @@
import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.engine.NullWriter;
import org.apache.tapestry.form.AbstractFormComponent;
+import org.apache.tapestry.markup.NestedMarkupWriterImpl;
import org.apache.tapestry.services.ComponentRenderWorker;
import org.apache.tapestry.services.DataSqueezer;
import org.apache.tapestry.services.ExpressionEvaluator;
@@ -153,7 +154,7 @@
// swap out writers if necessary
if (getResponseBuilder().isDynamic()
- && getResponseBuilder().contains(this)) {
+ && getResponseBuilder().contains(this) &&
!NestedMarkupWriterImpl.class.isInstance(writer)) {
loopWriter = getResponseBuilder().getWriter(getClientId(),
ResponseBuilder.ELEMENT_TYPE);
}
