You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/03/31 17:53:02 UTC
svn commit: r929598 - in /tiles/framework/trunk/tiles-jsp/src/main:
java/org/apache/tiles/jsp/taglib/ resources/META-INF/tld/
Author: apetrelli
Date: Wed Mar 31 15:53:02 2010
New Revision: 929598
URL: http://svn.apache.org/viewvc?rev=929598&view=rev
Log:
TILES-500
Applied patch by Mck SembWever.
Fixed some JSP docs, and added the flush attribute in <tiles:getAsString>
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java?rev=929598&r1=929597&r2=929598&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java Wed Mar 31 15:53:02 2010
@@ -97,7 +97,7 @@ public class GetAsStringTag extends Simp
private String preparer;
/**
- * This flag, if <code>true</code>, flushes the content before rendering.
+ * This flag, if <code>true</code>, flushes the content after rendering.
*
* @since 2.1.1
*/
@@ -253,7 +253,7 @@ public class GetAsStringTag extends Simp
/**
* Returns the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @return The flush flag.
* @since 2.1.1
@@ -264,7 +264,7 @@ public class GetAsStringTag extends Simp
/**
* Sets the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @param flush The flush flag.
* @since 2.1.1
@@ -312,5 +312,8 @@ public class GetAsStringTag extends Simp
model.end(JspUtil.getComposeStack(jspContext), JspUtil
.getCurrentContainer(jspContext), writer, ignore,
jspContext);
+ if(isFlush()){
+ writer.flush();
+ }
}
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java?rev=929598&r1=929597&r2=929598&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java Wed Mar 31 15:53:02 2010
@@ -97,7 +97,7 @@ public class InsertAttributeTag extends
private String preparer;
/**
- * This flag, if <code>true</code>, flushes the content before rendering.
+ * This flag, if <code>true</code>, flushes the content after rendering.
*
* @since 2.1.1
*/
@@ -253,7 +253,7 @@ public class InsertAttributeTag extends
/**
* Returns the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @return The flush flag.
* @since 2.1.1
@@ -264,7 +264,7 @@ public class InsertAttributeTag extends
/**
* Sets the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @param flush The flush flag.
* @since 2.1.1
@@ -310,5 +310,8 @@ public class InsertAttributeTag extends
JspUtil.evaluateFragment(getJspBody());
model.end(JspUtil.getComposeStack(jspContext), JspUtil
.getCurrentContainer(jspContext), ignore, jspContext);
+ if(isFlush()){
+ jspContext.getOut().flush();
+ }
}
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java?rev=929598&r1=929597&r2=929598&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java Wed Mar 31 15:53:02 2010
@@ -64,7 +64,7 @@ public class InsertDefinitionTag extends
private String preparer;
/**
- * This flag, if <code>true</code>, flushes the content before rendering.
+ * This flag, if <code>true</code>, flushes the content after rendering.
*
* @since 2.1.1
*/
@@ -161,7 +161,7 @@ public class InsertDefinitionTag extends
/**
* Returns the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @return The flush flag.
* @since 2.1.1
@@ -172,7 +172,7 @@ public class InsertDefinitionTag extends
/**
* Sets the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @param flush The flush flag.
* @since 2.1.1
@@ -277,5 +277,8 @@ public class InsertDefinitionTag extends
JspUtil.evaluateFragment(getJspBody());
model.end(JspUtil.getCurrentContainer(jspContext), name, template,
templateType, templateExpression, role, preparer, jspContext);
+ if(isFlush()){
+ jspContext.getOut().flush();
+ }
}
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java?rev=929598&r1=929597&r2=929598&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java Wed Mar 31 15:53:02 2010
@@ -59,7 +59,7 @@ public class InsertTemplateTag extends S
private String preparer;
/**
- * This flag, if <code>true</code>, flushes the content before rendering.
+ * This flag, if <code>true</code>, flushes the content after rendering.
*
* @since 2.1.1
*/
@@ -138,7 +138,7 @@ public class InsertTemplateTag extends S
/**
* Returns the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @return The flush flag.
* @since 2.1.1
@@ -149,7 +149,7 @@ public class InsertTemplateTag extends S
/**
* Sets the flush flag. If <code>true</code>, current page out stream
- * is flushed before insertion.
+ * is flushed after insertion.
*
* @param flush The flush flag.
* @since 2.1.1
@@ -254,5 +254,8 @@ public class InsertTemplateTag extends S
JspUtil.evaluateFragment(getJspBody());
model.end(JspUtil.getCurrentContainer(jspContext), template,
templateType, templateExpression, role, preparer, jspContext);
+ if(isFlush()){
+ jspContext.getOut().flush();
+ }
}
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld?rev=929598&r1=929597&r2=929598&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/tiles-jsp.tld Wed Mar 31 15:53:02 2010
@@ -105,7 +105,7 @@
<description>
<![CDATA[
<p>True or false. If true, current page out stream is flushed
- before insertion.</p>
+ after insertion.</p>
]]>
</description>
<name>flush</name>
@@ -230,7 +230,7 @@
<description>
<![CDATA[
<p>True or false. If true, current page out stream is flushed
- before insertion.</p>
+ after insertion.</p>
]]>
</description>
<name>flush</name>
@@ -323,7 +323,7 @@
<description>
<![CDATA[
<p>True or false. If true, current page out stream is flushed
- before insertion.</p>
+ after insertion.</p>
]]>
</description>
<name>flush</name>
@@ -786,6 +786,18 @@
<attribute>
<description>
<![CDATA[
+ <p>True or false. If true, current page out stream is flushed
+ after insertion.</p>
+ ]]>
+ </description>
+ <name>flush</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ <type>boolean</type>
+ </attribute>
+ <attribute>
+ <description>
+ <![CDATA[
<p>
If the user is in the specified role, the tag is taken into account;
otherwise, the tag is ignored (skipped).