Author: jkuhnert
Date: Sat Nov 11 18:21:32 2006
New Revision: 473850
URL: http://svn.apache.org/viewvc?view=rev&rev=473850
Log:
Removed Foreach component.
Removed:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Foreach.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/components/Foreach.jwc
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Chart.page
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/PaletteResults.page
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/Framework.library
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.page
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.wml
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context14/ListEditResults.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/ProtectedLinkResult.page
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/impl/ImplicitComponents.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/lib/Dumper.page
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/ImplicitComponents.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/tree/components/TreeNodeView.jwc
Sat Nov 11 18:21:32 2006
@@ -102,7 +102,7 @@
<component id="connectImage" type="Image">
<binding name="image" value="connectImage"/>
</component>
- <component id="foreachConnectImage" type="Foreach">
+ <component id="foreachConnectImage" type="For">
<binding name="source" value="foreachConnectImageList"/>
<binding name="value" value="currentForeachConnectImageValue"/>
</component>
Modified:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Chart.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Chart.page?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Chart.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/Chart.page
Sat Nov 11 18:21:32 2006
@@ -34,7 +34,7 @@
<binding name="delegate" value="bean:delegate"/>
</component>
- <component id="plotValues" type="Foreach">
+ <component id="plotValues" type="For">
<binding name="source" value="plotValues"/>
<binding name="value" value="plotValue"/>
<binding name="element" value="literal:tr"/>
Modified:
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/PaletteResults.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/PaletteResults.page?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/PaletteResults.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-examples/Workbench/src/context/WEB-INF/PaletteResults.page
Sat Nov 11 18:21:32 2006
@@ -21,7 +21,7 @@
<page-specification
class="org.apache.tapestry.workbench.palette.PaletteResults">
- <component id="loop" type="Foreach">
+ <component id="loop" type="For">
<binding name="element" value="literal:li"/>
<binding name="source" value="selectedColors"/>
</component>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/Framework.library
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/Framework.library?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/Framework.library
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/Framework.library
Sat Nov 11 18:21:32 2006
@@ -48,7 +48,6 @@
<component-type type="ExceptionDisplay"
specification-path="html/ExceptionDisplay.jwc"/>
<component-type type="ExternalLink"
specification-path="link/ExternalLink.jwc"/>
<component-type type="FieldLabel"
specification-path="valid/FieldLabel.jwc"/>
- <component-type type="Foreach"
specification-path="components/Foreach.jwc"/>
<component-type type="Frame" specification-path="html/Frame.jwc"/>
<component-type type="For" specification-path="components/For.jwc"/>
<component-type type="Form" specification-path="form/Form.jwc"/>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IComponent.java
Sat Nov 11 18:21:32 2006
@@ -280,7 +280,7 @@
* Returns the contained components as an unmodifiable [EMAIL PROTECTED]
Map}. This allows peer components
* to work together without directly involving their container ... the
classic example is to
* have an [EMAIL PROTECTED] org.apache.tapestry.components.Insert}work
with an enclosing
- * [EMAIL PROTECTED] org.apache.tapestry.components.Foreach}.
+ * [EMAIL PROTECTED] org.apache.tapestry.components.For}.
* <p>
* This is late addition to Tapestry, because it also opens the door to
abuse, since it is quite
* possible to break the "black box" aspect of a component by interacting
directly with
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/IRequestCycle.java
Sat Nov 11 18:21:32 2006
@@ -44,7 +44,7 @@
* components. In the rewind phase, a previous page render is redone
(discarding output) until a
* specific component of the page is reached. This rewinding ensures that the
page is restored to
* the exact state it had when the URL for the request cycle was generated,
taking into account the
- * dynamic nature of the page ([EMAIL PROTECTED]
org.apache.tapestry.components.Foreach},
+ * dynamic nature of the page ([EMAIL PROTECTED]
org.apache.tapestry.components.For},
* [EMAIL PROTECTED] org.apache.tapestry.components.Conditional}, etc.). Once
this component is reached, it
* can notify its [EMAIL PROTECTED] IActionListener}. The listener has the
ability to update the state of any
* pages and select a new result page.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.page?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.page
Sat Nov 11 18:21:32 2006
@@ -29,7 +29,7 @@
<binding name="service" expression="@[EMAIL PROTECTED]"/>
</component>
- <component id="foreachProperty" type="Foreach">
+ <component id="foreachProperty" type="For">
<static-binding name="element" value="tr"/>
<binding name="source" expression="current.properties"/>
</component>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.wml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/wml/pages/WMLException.wml?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
Binary files - no diff available.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context14/ListEditResults.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context14/ListEditResults.html?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context14/ListEditResults.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test-data/context14/ListEditResults.html
Sat Nov 11 18:21:32 2006
@@ -2,7 +2,7 @@
<body jwcid="@Body">
<table>
-<tr jwcid="@Foreach" element="tr" source="ognl:sortedColorKeys"
value="ognl:colorKey">
+<tr jwcid="@For" element="tr" source="ognl:sortedColorKeys"
value="ognl:colorKey">
<th><span jwcid="@Insert" value="ognl:colorKey">Color</span>:</th>
<td><span jwcid="@Insert" value="ognl:colorName">Mauve</span></td>
</tr>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/ProtectedLinkResult.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/ProtectedLinkResult.page?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/ProtectedLinkResult.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/ProtectedLinkResult.page
Sat Nov 11 18:21:32 2006
@@ -25,7 +25,7 @@
<static-binding name="title">ProtectedLink: Result</static-binding>
</component>
- <component id="foreach" type="Foreach">
+ <component id="foreach" type="For">
<binding name="source" expression="parameters"/>
<static-binding name="element">li</static-binding>
</component>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/impl/ImplicitComponents.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/impl/ImplicitComponents.html?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/impl/ImplicitComponents.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/app/impl/ImplicitComponents.html
Sat Nov 11 18:21:32 2006
@@ -5,7 +5,7 @@
Application Name: <span jwcid="@Insert"
value="ognl:engine.specification.name"/>
<ul>
-<li jwcid="[EMAIL PROTECTED]"
+<li jwcid="[EMAIL PROTECTED]"
source="ognl:{ "Alpha", "Beta", "Gamma" }"
element="li">
<span jwcid="@Insert" value="ognl:components.loop.value"/>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/lib/Dumper.page
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/lib/Dumper.page?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/lib/Dumper.page
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/lib/Dumper.page
Sat Nov 11 18:21:32 2006
@@ -28,7 +28,7 @@
<binding name="title" value="literal:Dumper"/>
</component>
- <component id="foreach" type="Foreach">
+ <component id="foreach" type="For">
<binding name="source" value="objects"/>
<binding name="value" value="currentObject"/>
<binding name="element" value="literal:tr"/>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/ImplicitComponents.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/ImplicitComponents.html?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
Binary files - no diff available.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?view=diff&rev=473850&r1=473849&r2=473850
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Sat Nov 11 18:21:32 2006
@@ -554,7 +554,7 @@
assertTokenCount(tokens, 18);
assertOpenToken(tokens[1], "$Body", "Body", "body", 4);
- assertOpenToken(tokens[3], "loop", "Foreach", "tr", 7);
+ assertOpenToken(tokens[3], "loop", "For", "tr", 7);
assertTemplateAttributes(tokens[3], buildMap(new String[]
{ "element", "tr", "source", "ognl:items" }));
