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 2007/03/01 12:58:05 UTC

svn commit: r513289 - in /tiles/framework/trunk: tiles-api/src/main/java/org/apache/tiles/ tiles-api/src/main/java/org/apache/tiles/mgmt/ tiles-core/src/main/java/org/apache/tiles/definition/

Author: apetrelli
Date: Thu Mar  1 03:58:04 2007
New Revision: 513289

URL: http://svn.apache.org/viewvc?view=rev&rev=513289
Log:
TILES-125
Moved attribute handling methods from ComponentDefinition to TileDefinition.
Added a new constructor in ComponentAttribute.

Modified:
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java?view=diff&rev=513289&r1=513288&r2=513289
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/ComponentAttribute.java Thu Mar  1 03:58:04 2007
@@ -133,6 +133,22 @@
     }
 
     /**
+     * Constructor.
+     *
+     * @param name name of the attribute
+     * @param value Object to store.
+     * @param role  Asociated role.
+     * @param type  Attribute type.
+     */
+    public ComponentAttribute(String name, Object value, String role,
+            String type) {
+        this.name = name;
+        this.value = value;
+        this.role = role;
+        this.type = type;
+    }
+
+    /**
      * Get role.
      * @return the name of the required role(s)
      */

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java?view=diff&rev=513289&r1=513288&r2=513289
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java Thu Mar  1 03:58:04 2007
@@ -145,6 +145,27 @@
     }
 
     /**
+     * Put a new attribute in this component
+     *
+     * @param key   String key for attribute
+     * @param value Attibute value.
+     */
+    public void putAttribute(String key, ComponentAttribute value) {
+        attributes.put(key, value);
+    }
+
+    /**
+     * Add an attribute to this component.
+     * <p/>
+     * This method is used by Digester to load definitions.
+     *
+     * @param attribute Attribute to add.
+     */
+    public void addAttribute(ComponentAttribute attribute) {
+        putAttribute(attribute.getName(), attribute);
+    }
+
+    /**
      * Get associated preparerInstance
      */
     public String getPreparer() {

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java?view=diff&rev=513289&r1=513288&r2=513289
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java Thu Mar  1 03:58:04 2007
@@ -82,16 +82,6 @@
         this.template = template;
         this.attributes = attributes;
     }
-
-    /**
-     * Put a new attribute in this component
-     *
-     * @param key   String key for attribute
-     * @param value Attibute value.
-     */
-    public void putAttribute(String key, ComponentAttribute value) {
-        attributes.put(key, value);
-    }
     
     /**
      * Checks whether the <code>key</code> attribute has been set.
@@ -158,17 +148,6 @@
             + ", attributes="
             + attributes
             + "}\n";
-    }
-
-    /**
-     * Add an attribute to this component.
-     * <p/>
-     * This method is used by Digester to load definitions.
-     *
-     * @param attribute Attribute to add.
-     */
-    public void addAttribute(ComponentAttribute attribute) {
-        putAttribute(attribute.getName(), attribute);
     }
 
     /**