svn commit: r666270 - in /tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib: AddListAttributeTag.java PutListAttributeTag.java

[apetrelli]

Author: apetrelli
Date: Tue Jun 10 11:46:54 2008
New Revision: 666270

URL: http://svn.apache.org/viewvc?rev=666270&view=rev
Log:
TILES-276
Merge from TILES_2_0_X branch to trunk.
Removed the covariant return type for getValue, using a different method.

Modified:
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
    
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java

Modified: 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java?rev=666270&r1=666269&r2=666270&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
 (original)
+++ 
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
 Tue Jun 10 11:46:54 2008
@@ -41,7 +41,7 @@
      * @return The list of attributes.
      */
     @SuppressWarnings("unchecked")
-    public List<Attribute> getValue() {
+    public List<Attribute> getAttributes() {
         return (List<Attribute>) super.getValue();
     }
 
@@ -98,6 +98,6 @@
      * @param attribute The attribute to add.
      */
     private void addValue(Attribute attribute) {
-        this.getValue().add(attribute);
+        this.getAttributes().add(attribute);
     }
 }

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=666270&r1=666269&r2=666270&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
 Tue Jun 10 11:46:54 2008
@@ -41,7 +41,7 @@
      * @return The value of this list attribute.
      */
     @SuppressWarnings("unchecked")
-    public List<Attribute> getValue() {
+    public List<Attribute> getAttributes() {
         return (List<Attribute>) super.getValue();
     }
 
@@ -99,6 +99,6 @@
      * @param attribute The attribute to add.
      */
     private void addValue(Attribute attribute) {
-        this.getValue().add(attribute);
+        this.getAttributes().add(attribute);
     }
 }