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 2008/02/07 20:16:19 UTC
svn commit: r619578 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/impl/
tiles-core/src/main/java/org/apache/tiles/servlet/context/
tiles-core/src/main/java/org/apache/tiles/util/ tiles-...
Author: apetrelli
Date: Thu Feb 7 11:16:16 2008
New Revision: 619578
URL: http://svn.apache.org/viewvc?rev=619578&view=rev
Log:
TILES-248
Merge from TILES_2_0_X branch to trunk.
Fixed "@since" tags.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java Thu Feb 7 11:16:16 2008
@@ -112,6 +112,7 @@
/**
* The roles that can render this attribute.
+ * @since 2.0.6
*/
protected Set<String> roles = null;
@@ -240,6 +241,7 @@
* Returns the roles that can render this attribute.
*
* @return The enabled roles.
+ * @since 2.0.6
*/
public Set<String> getRoles() {
return roles;
@@ -266,6 +268,7 @@
* Sets the roles that can render this attribute.
*
* @param roles The enabled roles.
+ * @since 2.0.6
*/
public void setRoles(Set<String> roles) {
this.roles = roles;
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java Thu Feb 7 11:16:16 2008
@@ -52,6 +52,7 @@
protected String template = null;
/**
* The roles that can render this definition.
+ * @since 2.0.6
*/
protected Set<String> roles = null;
/**
@@ -161,6 +162,7 @@
* Returns the roles that can render this attribute.
*
* @return The enabled roles.
+ * @since 2.0.6
*/
public Set<String> getRoles() {
return roles;
@@ -187,6 +189,7 @@
* Sets the roles that can render this attribute.
*
* @param roles The enabled roles.
+ * @since 2.0.6
*/
public void setRoles(Set<String> roles) {
this.roles = roles;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Thu Feb 7 11:16:16 2008
@@ -415,6 +415,7 @@
*
* @param tilesContext The Tiles context object to use.
* @return The needed stack of contexts.
+ * @since 2.0.6
*/
@SuppressWarnings("unchecked")
protected Stack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
@@ -435,6 +436,7 @@
*
* @param context The context to push.
* @param tilesContext The Tiles context object to use.
+ * @since 2.0.6
*/
protected void pushContext(AttributeContext context,
TilesRequestContext tilesContext) {
@@ -447,6 +449,7 @@
*
* @param tilesContext The Tiles context object to use.
* @return The popped context object.
+ * @since 2.0.6
*/
protected AttributeContext popContext(TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack = getContextStack(tilesContext);
@@ -459,6 +462,7 @@
* @param tilesContext current Tiles application context.
* @return BasicAttributeContext or null if context is not found or an
* jspException is present in the request.
+ * @since 2.0.6
*/
protected AttributeContext getContext(TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack = getContextStack(tilesContext);
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletTilesRequestContext.java Thu Feb 7 11:16:16 2008
@@ -275,6 +275,7 @@
* @param ex The exception to wrap.
* @param message The message of the exception.
* @return The wrapped exception.
+ * @since 2.0.6
*/
protected IOException wrapServletException(ServletException ex, String message) {
IOException retValue;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/context/ServletUtil.java Thu Feb 7 11:16:16 2008
@@ -28,11 +28,13 @@
* Utilities for Tiles servlet support.
*
* @version $Rev$ $Date$
+ * @since 2.0.6
*/
public final class ServletUtil {
/**
* Name of the attribute used to store the force-include option.
+ * @since 2.0.6
*/
public static final String FORCE_INCLUDE_ATTRIBUTE_NAME =
"org.apache.tiles.servlet.context.ServletTilesRequestContext.FORCE_INCLUDE";
@@ -48,6 +50,7 @@
*
* @param request The HTTP request.
* @return If <code>true</code> the include operation must be forced.
+ * @since 2.0.6
*/
public static boolean isForceInclude(HttpServletRequest request) {
Boolean retValue = (Boolean) request
@@ -61,6 +64,7 @@
* @param request The HTTP request.
* @param forceInclude If <code>true</code> the include operation must be
* forced.
+ * @since 2.0.6
*/
public static void setForceInclude(HttpServletRequest request,
boolean forceInclude) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/TilesIOException.java Thu Feb 7 11:16:16 2008
@@ -27,11 +27,13 @@
* but not in Java 5. It contains the same number of constructors.
*
* @version $Rev$ $Date$
+ * @since 2.0.6
*/
public class TilesIOException extends IOException {
/**
* Default constructor.
+ * @since 2.0.6
*/
public TilesIOException() {
}
@@ -40,6 +42,7 @@
* Constructor.
*
* @param message Message of the exception.
+ * @since 2.0.6
*/
public TilesIOException(String message) {
super(message);
@@ -49,6 +52,7 @@
* Constructor.
*
* @param cause The cause of the exception.
+ * @since 2.0.6
*/
public TilesIOException(Throwable cause) {
super();
@@ -60,6 +64,7 @@
*
* @param message Message of the exception.
* @param cause The cause of the exception.
+ * @since 2.0.6
*/
public TilesIOException(String message, Throwable cause) {
super(message);
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java?rev=619578&r1=619577&r2=619578&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java Thu Feb 7 11:16:16 2008
@@ -42,6 +42,7 @@
*
* @param context The page context.
* @return If <code>true</code> the include operation must be forced.
+ * @since 2.0.6
*/
public static boolean isForceInclude(PageContext context) {
Boolean retValue = (Boolean) context.getAttribute(
@@ -56,6 +57,7 @@
* @param context The page context.
* @param forceInclude If <code>true</code> the include operation must be
* forced.
+ * @since 2.0.6
*/
public static void setForceInclude(PageContext context, boolean forceInclude) {
Boolean retValue = Boolean.valueOf(forceInclude);