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/25 20:35:35 UTC
svn commit: r927562 - in /tiles/framework/trunk/tiles-jsp/src/main:
java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
resources/META-INF/tld/tiles-jsp.tld
Author: apetrelli
Date: Thu Mar 25 19:35:34 2010
New Revision: 927562
URL: http://svn.apache.org/viewvc?rev=927562&view=rev
Log:
TILES-495
Applied a modified version of the patch by Mck SembWever.
Deprecated the "type" properties in two tags.
Modified:
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.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/AddAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java?rev=927562&r1=927561&r2=927562&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java Thu Mar 25 19:35:34 2010
@@ -84,7 +84,10 @@ public class AddAttributeTag extends Sim
/**
* Requested type for the value.
+ *
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
private String type = null;
/**
@@ -162,7 +165,9 @@ public class AddAttributeTag extends Sim
* </ul>
*
* @return The attribute type.
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
public String getType() {
return type;
}
@@ -182,7 +187,9 @@ public class AddAttributeTag extends Sim
* </ul>
*
* @param type The attribute type.
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
public void setType(String type) {
this.type = type;
}
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java?rev=927562&r1=927561&r2=927562&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java Thu Mar 25 19:35:34 2010
@@ -62,7 +62,10 @@ public class PutListAttributeTag extends
/**
* Requested type for the value.
+ *
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
private String type = null;
/**
@@ -146,7 +149,9 @@ public class PutListAttributeTag extends
* </ul>
*
* @return The attribute type.
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
public String getType() {
return type;
}
@@ -166,7 +171,9 @@ public class PutListAttributeTag extends
* </ul>
*
* @param type The attribute type.
+ * @deprecated Do not use, ignored.
*/
+ @Deprecated
public void setType(String type) {
this.type = type;
}
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=927562&r1=927561&r2=927562&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 Thu Mar 25 19:35:34 2010
@@ -611,6 +611,19 @@
<description>
<![CDATA[
<p>
+ If the user is in the specified role, the tag is taken into account;
+ otherwise, the tag is ignored (skipped).
+ </p>
+ ]]>
+ </description>
+ <name>role</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+ <![CDATA[
+ <p>
If true, the attribute value will be cascaded to nested templates and
definitions.
</p>
@@ -715,6 +728,19 @@
<name>addListAttribute</name>
<tag-class>org.apache.tiles.jsp.taglib.AddListAttributeTag</tag-class>
<body-content>scriptless</body-content>
+ <attribute>
+ <description>
+ <![CDATA[
+ <p>
+ If the user is in the specified role, the tag is taken into account;
+ otherwise, the tag is ignored (skipped).
+ </p>
+ ]]>
+ </description>
+ <name>role</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<description>