Revision: 868
          http://stripes.svn.sourceforge.net/stripes/?rev=868&view=rev
Author:   mongus
Date:     2008-02-27 06:40:42 -0800 (Wed, 27 Feb 2008)

Log Message:
-----------
removed call to release() and moved cleanup code into doEndTag()

Modified Paths:
--------------
    trunk/stripes/src/net/sourceforge/stripes/tag/FieldMetadataTag.java
    trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
    trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java

Modified: trunk/stripes/src/net/sourceforge/stripes/tag/FieldMetadataTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/FieldMetadataTag.java 
2008-02-27 14:18:21 UTC (rev 867)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/FieldMetadataTag.java 
2008-02-27 14:40:42 UTC (rev 868)
@@ -261,6 +261,11 @@
                 throw new StripesJspException("IOException while writing 
output in LinkTag.", ioe);
             }
         }
+        
+        // Only keep the type attribute between uses
+        String type = getAttributes().get("type");
+        getAttributes().clear();
+        getAttributes().put("type", type);
 
         return SKIP_BODY;
     }
@@ -397,15 +402,4 @@
             return formId;
         }
     }
-
-    /** Release method to clean up the state of the tag to prepare it for 
re-use. */
-    @Override
-    public void release() {
-        // Because the type attribute is set in the constructor and
-        // the attributes are cleared we need to save the type and
-        // replace it after calling super.release().
-        String type = getAttributes().get("type");
-        super.release();
-        getAttributes().put("type", type);
-    }
 }

Modified: 
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
===================================================================
--- 
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java    
    2008-02-27 14:18:21 UTC (rev 867)
+++ 
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java    
    2008-02-27 14:40:42 UTC (rev 868)
@@ -296,14 +296,14 @@
                              new 
BeanComparator(getPageContext().getRequest().getLocale(), props));
         }
 
+        InputOptionTag tag = new InputOptionTag();
+        tag.setParent(this);
+        tag.setPageContext(getPageContext());
+        
         Object lastGroup = null;
 
         for (Entry entry : sortedEntries) {
-            InputOptionTag tag = new InputOptionTag();
-            
             // Set properties common to all options
-            tag.setParent(this);
-            tag.setPageContext(getPageContext());
             tag.getAttributes().putAll(getAttributes());
             
             // Set properties for this tag

Modified: trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java  
2008-02-27 14:18:21 UTC (rev 867)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/InputTagSupport.java  
2008-02-27 14:40:42 UTC (rev 868)
@@ -438,26 +438,18 @@
             return result;
         }
         finally {
-            this.release();
+            this.errorRenderer = null;
+            this.fieldErrors = null;
+            this.fieldErrorsLoaded = false;
+            this.focus = false;
+
+            // Only keep the type attribute between uses
+            String type = getAttributes().get("type");
+            getAttributes().clear();
+            getAttributes().put("type", type);
         }
     }
     
-    /** Release method to clean up the state of the tag ready for re-use. */
-    @Override
-    public void release() {
-        this.errorRenderer = null;
-        this.fieldErrors = null;
-        this.fieldErrorsLoaded = false;
-        this.focus = false;
-
-        // Because the type attribute is set in the constructor and
-        // the attributes are cleared we need to save the type and
-        // replace it after calling super.release().
-        String type = getAttributes().get("type");
-        super.release();
-        getAttributes().put("type", type);
-    }
-
     /** Rethrows the passed in throwable in all cases. */
     public void doCatch(Throwable throwable) throws Throwable { throw 
throwable; }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to