Author: jcompagner
Date: Wed Nov 14 04:53:44 2007
New Revision: 594860
URL: http://svn.apache.org/viewvc?rev=594860&view=rev
Log:
empty <wicket:fragment> shorthand <wicket:fragment /> does not work WICKET-1141
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java?rev=594860&r1=594859&r2=594860&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/Fragment.java
Wed Nov 14 04:53:44 2007
@@ -127,7 +127,7 @@
* The model for this fragment
*/
public Fragment(final String id, final String markupId, final
MarkupContainer markupProvider,
- final IModel model)
+ final IModel model)
{
super(id, model);
@@ -199,8 +199,8 @@
if (providerMarkupStream == null)
{
throw new MarkupNotFoundException(
- "Fragment: No markup stream found for
providing markup container " +
-
markupProvider.toString() + ". Fragment: " + toString());
+ "Fragment: No markup stream found for providing
markup container " +
+ markupProvider.toString() + ".
Fragment: " + toString());
}
renderFragment(providerMarkupStream, openTag);
@@ -254,9 +254,9 @@
if (index == -1)
{
throw new MarkupException("Markup of component class `"
+
-
providerMarkupStream.getContainerClass().getName() +
- "` does not contain a fragment with
wicket:id `" + markupId + "`. Context: " +
- toString());
+
providerMarkupStream.getContainerClass().getName() +
+ "` does not contain a fragment with wicket:id
`" + markupId + "`. Context: " +
+ toString());
}
// Set the markup stream position to where the fragment begins
@@ -267,12 +267,16 @@
// Get the fragments open tag
ComponentTag fragmentOpenTag =
providerMarkupStream.getTag();
- // We'll completely ignore the fragments open tag.
It'll not be
- // rendered
- providerMarkupStream.next();
+ // if it is an open close tag, skip this fragment.
+ if (!fragmentOpenTag.isOpenClose())
+ {
+ // We'll completely ignore the fragments open
tag. It'll not be
+ // rendered
+ providerMarkupStream.next();
- // Render the body of the fragment
- super.onComponentTagBody(providerMarkupStream,
fragmentOpenTag);
+ // Render the body of the fragment
+ super.onComponentTagBody(providerMarkupStream,
fragmentOpenTag);
+ }
}
finally
{
@@ -286,7 +290,7 @@
* Position the markup stream at the child component relative to the
<b>provider</b> markup
*
* @param path
- * @return
+ * @return The markup stream for the given component.
*/
public MarkupStream findComponentIndex(final String path)
{
@@ -295,9 +299,9 @@
if (index == -1)
{
throw new MarkupException("Markup of component class `"
+
-
markupStream.getContainerClass().getName() +
- "` does not contain a fragment with
wicket:id `" + markupId + "`. Context: " +
- toString());
+ markupStream.getContainerClass().getName() +
+ "` does not contain a fragment with wicket:id
`" + markupId + "`. Context: " +
+ toString());
}
markupStream.setCurrentIndex(index);
return markupStream;
