You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/04/03 21:31:55 UTC
svn commit: r644453 - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/corelib/components/ site/apt/
test/java/org/apache/tapestry/integration/
Author: hlship
Date: Thu Apr 3 12:31:54 2008
New Revision: 644453
URL: http://svn.apache.org/viewvc?rev=644453&view=rev
Log:
TAPESTRY-2327: The Any and FormInjector components should have an element parameter, for overriding the element name
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java?rev=644453&r1=644452&r2=644453&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Any.java Thu Apr 3 12:31:54 2008
@@ -16,6 +16,8 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.TapestryConstants;
+import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -25,12 +27,20 @@
@SupportsInformalParameters
public class Any
{
+ @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ private String _element;
+
@Inject
private ComponentResources _resources;
+ String defaultElement()
+ {
+ return _resources.getElementName("div");
+ }
+
void beginRender(MarkupWriter writer)
{
- writer.element(_resources.getElementName(null));
+ writer.element(_element);
_resources.renderInformalParameters(writer);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java?rev=644453&r1=644452&r2=644453&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/FormInjector.java Thu Apr 3 12:31:54 2008
@@ -63,6 +63,13 @@
@Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
private String _show;
+ /**
+ * The element name to render, which is normally the element name used to represent the FormInjector component in
+ * the template, or "div".
+ */
+ @Parameter(defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
+ private String _element;
+
@Environmental
private PageRenderSupport _pageRenderSupport;
@@ -92,11 +99,16 @@
@Inject
private Environment _environment;
+ String defaultElement()
+ {
+ return _resources.getElementName("div");
+ }
+
void beginRender(MarkupWriter writer)
{
_clientId = _pageRenderSupport.allocateClientId(_resources);
- writer.element(_resources.getElementName("div"),
+ writer.element(_element,
"id", _clientId);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java?rev=644453&r1=644452&r2=644453&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java Thu Apr 3 12:31:54 2008
@@ -186,7 +186,7 @@
* through the loop). The default is derived from the component template.
*/
@Parameter(value = "prop:componentResources.elementName", defaultPrefix = TapestryConstants.LITERAL_BINDING_PREFIX)
- private String _elementName;
+ private String _element;
/**
* The current value, set before the component renders its body.
@@ -306,16 +306,16 @@
void beforeRenderBody(MarkupWriter writer)
{
- if (_elementName != null)
+ if (_element != null)
{
- writer.element(_elementName);
+ writer.element(_element);
_resources.renderInformalParameters(writer);
}
}
void afterRenderBody(MarkupWriter writer)
{
- if (_elementName != null) writer.end();
+ if (_element != null) writer.end();
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt?rev=644453&r1=644452&r2=644453&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt Thu Apr 3 12:31:54 2008
@@ -20,6 +20,11 @@
{{{../apidocs/org/apache/tapestry/ioc/Resource.html}Resource}} interface. The semantics
of some of the other methods were slightly alterred.
+* Loop element parameter
+
+ The Loop components' elementName parameter was renamed to simply element (to be consistent
+ with element parameters added to the Any and FormInjector components).
+
Release 5.0.11
* Field.getElementName()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=644453&r1=644452&r2=644453&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Thu Apr 3 12:31:54 2008
@@ -1658,7 +1658,7 @@
* TAPESTRY-2114
*/
@Test
- public void boolean_properties_can_user_get_or_is()
+ public void boolean_properties_can_use_get_or_is_as_method_name_prefix()
{
start("Boolean Property Demo", "clear");