svn commit: r747339 - in /tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template: AttributeResolver.java DefaultAttributeResolver.java GetAsStringModel.java InsertAttributeModel.java

[apetrelli]

Author: apetrelli
Date: Tue Feb 24 11:10:28 2009
New Revision: 747339

URL: http://svn.apache.org/viewvc?rev=747339&view=rev
Log:
TILES-371
Now the role attribute is used during resolution of the attribute itself.

Modified:
    
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
    
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
    
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
    
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java

Modified: 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java?rev=747339&r1=747338&r2=747339&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
 (original)
+++ 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/AttributeResolver.java
 Tue Feb 24 11:10:28 2009
@@ -5,6 +5,6 @@
 
 public interface AttributeResolver {
     Attribute computeAttribute(TilesContainer container, Attribute attribute,
-            String name, boolean ignore, Object defaultValue,
-            String defaultValueRole, String defaultValueType, Object... 
requestItems);
+            String name, String role, boolean ignore,
+            Object defaultValue, String defaultValueRole, String 
defaultValueType, Object... requestItems);
 }

Modified: 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java?rev=747339&r1=747338&r2=747339&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
 (original)
+++ 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/DefaultAttributeResolver.java
 Tue Feb 24 11:10:28 2009
@@ -8,13 +8,13 @@
 
     /**
      * Computes the attribute to render, evaluating the various tag attributes.
-     *
      * @param context The page context.
+     *
      * @return The computed attribute.
      */
     public Attribute computeAttribute(TilesContainer container, Attribute 
attribute,
-            String name, boolean ignore, Object defaultValue,
-            String defaultValueRole, String defaultValueType, Object... 
requestItems) {
+            String name, String role, boolean ignore,
+            Object defaultValue, String defaultValueRole, String 
defaultValueType, Object... requestItems) {
         if (attribute == null) {
             AttributeContext evaluatingContext = container
                     .getAttributeContext(requestItems);
@@ -28,6 +28,10 @@
                 }
             }
         }
+        if (attribute != null && role != null && !"".equals(role.trim())) {
+            attribute = new Attribute(attribute);
+            attribute.setRole(role);
+        }
         return attribute;
     }
 

Modified: 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java?rev=747339&r1=747338&r2=747339&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
 (original)
+++ 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/GetAsStringModel.java
 Tue Feb 24 11:10:28 2009
@@ -27,8 +27,8 @@
             container.prepare(preparer, requestItems);
         }
         Attribute attribute = attributeResolver.computeAttribute(container,
-                value, name, ignore, defaultValue, defaultValueRole,
-                defaultValueType, requestItems);
+                value, name, role, ignore, defaultValue,
+                defaultValueRole, defaultValueType, requestItems);
         composeStack.push(attribute);
         container.startContext(requestItems);
     }

Modified: 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java?rev=747339&r1=747338&r2=747339&view=diff
==============================================================================
--- 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
 (original)
+++ 
tiles/framework/trunk/tiles-template/src/main/java/org/apache/tiles/template/InsertAttributeModel.java
 Tue Feb 24 11:10:28 2009
@@ -26,8 +26,8 @@
             container.prepare(preparer, requestItems);
         }
         Attribute attribute = attributeResolver.computeAttribute(container,
-                value, name, ignore, defaultValue, defaultValueRole,
-                defaultValueType, requestItems);
+                value, name, role, ignore, defaultValue,
+                defaultValueRole, defaultValueType, requestItems);
         composeStack.push(attribute);
         container.startContext(requestItems);
     }