Author: hlship
Date: Thu Aug 28 17:41:45 2008
New Revision: 690060
URL: http://svn.apache.org/viewvc?rev=690060&view=rev
Log:
TAPESTRY-2627: The else parameter of If should have a default binding prefix of
literal
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java?rev=690060&r1=690059&r2=690060&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/AjaxFormLoop.java
Thu Aug 28 17:41:45 2008
@@ -72,7 +72,7 @@
* A block to render after the loop as the body of the [EMAIL PROTECTED]
org.apache.tapestry5.corelib.components.FormInjector}.
* This typically contains a [EMAIL PROTECTED]
org.apache.tapestry5.corelib.components.AddRowLink}.
*/
- @Parameter("block:defaultAddRow")
+ @Parameter(value = "block:defaultAddRow", defaultPrefix =
BindingConstants.LITERAL)
@Property(write = false)
private Block addRow;
@@ -428,5 +428,4 @@
{
heartbeat.end();
}
-
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java?rev=690060&r1=690059&r2=690060&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
Thu Aug 28 17:41:45 2008
@@ -154,7 +154,7 @@
* "There is no data to display". This parameter is used to customize that
message, possibly including components to
* allow the user to create new objects.
*/
- @Parameter(value = "block:empty")
+ @Parameter(value = "block:empty", defaultPrefix = BindingConstants.LITERAL)
private Block empty;
@@ -465,7 +465,6 @@
int endIndex = Math.min(startIndex + rowsPerPage - 1, availableRows -
1);
cachingSource.prepare(startIndex, endIndex,
sortModel.getSortContraints());
-
}
Object beginRender(MarkupWriter writer)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java?rev=690060&r1=690059&r2=690060&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
Thu Aug 28 17:41:45 2008
@@ -14,6 +14,7 @@
package org.apache.tapestry5.corelib.components;
+import org.apache.tapestry5.BindingConstants;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.annotations.Parameter;
@@ -41,7 +42,7 @@
* An alternate [EMAIL PROTECTED] org.apache.tapestry5.Block} to render if
the test parameter is false. The default, null,
* means render nothing in that situation.
*/
- @Parameter(name = "else")
+ @Parameter(name = "else", defaultPrefix = BindingConstants.LITERAL)
private Block elseBlock;
/**
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java?rev=690060&r1=690059&r2=690060&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
Thu Aug 28 17:41:45 2008
@@ -14,6 +14,7 @@
package org.apache.tapestry5.corelib.components;
+import org.apache.tapestry5.BindingConstants;
import org.apache.tapestry5.Block;
import org.apache.tapestry5.annotations.Parameter;
@@ -33,7 +34,7 @@
* An alternate [EMAIL PROTECTED] org.apache.tapestry5.Block} to render if
the test parameter is false. The default, null,
* means render nothing in that situation.
*/
- @Parameter(name = "else")
+ @Parameter(name = "else", defaultPrefix = BindingConstants.LITERAL)
private Block elseBlock;
/**
