svn commit: r512173 - in /tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib: AttributeTagSupport.java RenderTagSupport.java

[apetrelli]

Author: apetrelli
Date: Tue Feb 27 00:29:33 2007
New Revision: 512173

URL: http://svn.apache.org/viewvc?view=rev&rev=512173
Log:
Removed useless code and corrected a message string.

Modified:
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
    
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java?view=diff&rev=512173&r1=512172&r2=512173
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
 Tue Feb 27 00:29:33 2007
@@ -105,11 +105,11 @@
             }
 
             if (attribute == null) {
-                throw new JspException("Attribute whith name '" + name + "' + 
not found");
+                throw new JspException("Attribute whith name '" + name + "' 
not found");
             }
 
             if (attribute.getValue() == null) {
-                throw new JspException("Attribute whith name '" + name + "' + 
has a null value.");
+                throw new JspException("Attribute whith name '" + name + "' 
has a null value.");
             }
         }
 

Modified: 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
URL: 
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java?view=diff&rev=512173&r1=512172&r2=512173
==============================================================================
--- 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
 (original)
+++ 
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
 Tue Feb 27 00:29:33 2007
@@ -31,9 +31,6 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TryCatchFinally;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * Support for all tags which render (a template, or definition).
@@ -59,8 +56,6 @@
     protected boolean flush;
     protected boolean ignore;
 
-    private Map<String, ComponentAttribute> originalState;
-
     public String getPreparer() {
         return preparer;
     }
@@ -93,9 +88,8 @@
         super.release();
     }
 
-        public int doStartTag() {
+    public int doStartTag() {
         super.doStartTag();
-        cacheState();
         return isAccessAllowed() ? EVAL_BODY_BUFFERED : SKIP_BODY;
     }
 
@@ -104,7 +98,6 @@
     }
 
     public void doFinally() {
-        restoreState();
     }
 
     /**
@@ -153,23 +146,4 @@
             attribute
         );
     }
-
-    private void cacheState() {
-        originalState = new HashMap<String, ComponentAttribute>();
-        Iterator<String> i = componentContext.getAttributeNames();
-        while(i.hasNext()) {
-            String name = i.next();
-            ComponentAttribute original = componentContext.getAttribute(name);
-            ComponentAttribute a = new ComponentAttribute(
-                original.getValue(), original.getRole(), original.getType()
-            );
-            originalState.put(name, a);
-        }
-    }
-
-    private void restoreState() {
-        originalState.clear();
-        originalState.putAll(originalState);
-    }
-
 }