webwork/src/main/webwork/view/taglib ActionTag.java,1.5,1.6 ElseIfTag.java,1.4,1.5 ElseTag.java,1.3,1.4 I18nTag.java,1.3,1.4 IfTag.java,1.5,1.6 IncludeTag.java,1.4,1.5 IteratorTag.java,1.2,1.3 ParamTag.java,1.3,1.4 PropertyTag.java,1.5,1.6 TextTag.java,1.4,1.5 URLTag.java,1.6,1.7 WebWorkBodyTagSupport.java,1.3,1.4 WebWorkTagSupport.java,1.2,1.3

Update of /cvsroot/webwork/webwork/src/main/webwork/view/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv22636

Modified Files:
	ActionTag.java ElseIfTag.java ElseTag.java I18nTag.java 
	IfTag.java IncludeTag.java IteratorTag.java ParamTag.java 
	PropertyTag.java TextTag.java URLTag.java 
	WebWorkBodyTagSupport.java WebWorkTagSupport.java 
Log Message:
merged change

Index: ActionTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ActionTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ActionTag.java	8 May 2002 20:38:38 -0000	1.5
+++ ActionTag.java	21 May 2002 03:30:43 -0000	1.6
@@ -19,14 +19,14 @@
 import javax.servlet.jsp.PageContext;
 
 /**
- *	Instantiate a JavaBean.
+ * Instantiate a JavaBean.
  *
  * The bean may be an action, in which it is executed before used.
  * It is lazily executed, which means that you can set parameters
  * by using the "param" tag.
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public class ActionTag
       extends BeanTag
@@ -149,10 +149,10 @@
 
    public void release()
    {
-      super.release();
       ActionContext.setContext(oldContext);
       oldContext = null;
       context = null;
       bean = null;
+      super.release();
    }
 }

Index: ElseIfTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ElseIfTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ElseIfTag.java	8 May 2002 20:38:38 -0000	1.4
+++ ElseIfTag.java	21 May 2002 03:30:43 -0000	1.5
@@ -11,8 +11,8 @@
 
 /**
  *
- *	@author Maurice C. Parker ([email protected])
- *	@version $Revision$
+ * @author Maurice C. Parker ([email protected])
+ * @version $Revision$
  */
 public final class ElseIfTag
       extends WebWorkTagSupport {
@@ -67,10 +67,11 @@
    }
 
    public void release() {
-      super.release();
-      setId(null);
+      setId(null);
+
       // Reset
       test = null;
+      super.release();
    }
 }
 

Index: ElseTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ElseTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ElseTag.java	26 Apr 2002 19:29:53 -0000	1.3
+++ ElseTag.java	21 May 2002 03:30:43 -0000	1.4
@@ -12,8 +12,8 @@
 
 /**
  *
- *	@author Maurice C. Parker ([email protected])
- *	@version $Revision$
+ * @author Maurice C. Parker ([email protected])
+ * @version $Revision$
  */
 public final class ElseTag
       extends TagSupport {
@@ -37,8 +37,8 @@
    }
 
    public void release() {
-      super.release();
       setId(null);
+      super.release();
    }
 }
 

Index: I18nTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/I18nTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- I18nTag.java	8 May 2002 20:38:38 -0000	1.3
+++ I18nTag.java	21 May 2002 03:30:43 -0000	1.4
@@ -29,8 +29,8 @@
  * the text tag to access messages from any bundle, and not just the bundle
  * associated with the current action.
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public final class I18nTag
    extends WebWorkTagSupport
@@ -99,8 +99,8 @@
 
    public void release()
    {
-      super.release();
       nameAttr = null;
+      super.release();
    }
 }
 

Index: IfTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/IfTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- IfTag.java	8 May 2002 20:38:38 -0000	1.5
+++ IfTag.java	21 May 2002 03:30:43 -0000	1.6
@@ -11,8 +11,8 @@
 
 /**
  *
- *	@author Maurice C. Parker ([email protected])
- *	@version $Revision$
+ * @author Maurice C. Parker ([email protected])
+ * @version $Revision$
  */
 public final class IfTag
       extends WebWorkTagSupport {
@@ -59,11 +59,12 @@
    }
 
    public void release() {
-      super.release();
-      setId(null);
+      setId(null);
+
       // Reset
       test = null;
       answer = false;
+      super.release();
    }
 }
 

Index: IncludeTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/IncludeTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- IncludeTag.java	8 May 2002 20:38:38 -0000	1.4
+++ IncludeTag.java	21 May 2002 03:30:43 -0000	1.5
@@ -246,10 +246,10 @@
 
    public void release()
    {
-      super.release();
       pageAttr = null;
       valueAttr = null;
       params = null;
+      super.release();
    }
 }
 

Index: IteratorTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/IteratorTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- IteratorTag.java	8 May 2002 20:38:38 -0000	1.2
+++ IteratorTag.java	21 May 2002 03:30:43 -0000	1.3
@@ -12,13 +12,13 @@
 import java.util.*;
 
 /**
- *	Tag to iterate over an iterable value.
+ * Tag to iterate over an iterable value.
  *
  * An iterable value can be either of: java.util.Collection, java.util.Iterator,
  * java.util.Enumeration, java.util.Map, array, XML Node, or XML NodeList
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public final class IteratorTag
    extends WebWorkBodyTagSupport
@@ -190,7 +190,6 @@
 
    public void release()
    {
-      super.release();
       valueAttr = null;
       statusAttr = null;
       currentValue = null;
@@ -199,6 +198,7 @@
       statusState = null;
       statusName = null;
       oldStatus = null;
+      super.release();
    }
    // Inner classes -------------------------------------------------
 }

Index: ParamTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ParamTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ParamTag.java	8 May 2002 20:38:38 -0000	1.3
+++ ParamTag.java	21 May 2002 03:30:43 -0000	1.4
@@ -9,15 +9,15 @@
 import javax.servlet.jsp.JspException;
 
 /**
- *	This tag can be used to parameterize other tags, who implement
+ * This tag can be used to parameterize other tags, who implement
  * the ParametricTag interface declared here.
  *
  * The IncludeTag and BeanTag are examples of such tags.
  *
- *	@see IncludeTag
- *	@see BeanTag
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @see IncludeTag
+ * @see BeanTag
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public final class ParamTag
    extends WebWorkBodyTagSupport
@@ -76,9 +76,9 @@
 
    public void release()
    {
-      super.release();
       nameAttr = null;
       valueAttr = null;
+      super.release();
    }
 
    // Inner classes -------------------------------------------------

Index: PropertyTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/PropertyTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PropertyTag.java	10 May 2002 14:21:16 -0000	1.5
+++ PropertyTag.java	21 May 2002 03:30:43 -0000	1.6
@@ -133,10 +133,10 @@
 
    public void release()
    {
-      super.release();
       escape = null;
       valueAttr = null;
       hadBody = false;
+      super.release();
    }
 }
 

Index: TextTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/TextTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TextTag.java	8 May 2002 20:38:38 -0000	1.4
+++ TextTag.java	21 May 2002 03:30:43 -0000	1.5
@@ -16,7 +16,7 @@
 import java.util.WeakHashMap;
 
 /**
- *	Access a i18n-ized message. The message must be in a resource bundle
+ * Access a i18n-ized message. The message must be in a resource bundle
  * with the same name as the action that it is associated with. In practice
  * this means that you should create a properties file in the same package
  * as your Java class with the same name as your class, but with .properties
@@ -27,8 +27,8 @@
  * If the named message is not found, then the body of the tag will be used as default message.
  * If no body is used, then the name of the message will be used.
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public final class TextTag
       extends WebWorkBodyTagSupport
@@ -174,12 +174,12 @@
 
    public void release()
    {
-      super.release();
       nameAttr = null;
       value0Attr = null;
       value1Attr = null;
       value2Attr = null;
       value3Attr = null;
+      super.release();
    }
 }
 

Index: URLTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/URLTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- URLTag.java	8 May 2002 20:42:44 -0000	1.6
+++ URLTag.java	21 May 2002 03:30:43 -0000	1.7
@@ -161,11 +161,11 @@
 
    public void release()
    {
-      super.release();
       page = null;
       valueAttr = null;
       value = null;
       params = null;
+      super.release();
    }
 }
 

Index: WebWorkBodyTagSupport.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/WebWorkBodyTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WebWorkBodyTagSupport.java	8 May 2002 20:38:38 -0000	1.3
+++ WebWorkBodyTagSupport.java	21 May 2002 03:30:43 -0000	1.4
@@ -17,10 +17,10 @@
 import org.apache.log4j.Category;
 
 /**
- *	Base class for tags with bodies.
+ * Base class for tags with bodies.
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public abstract class WebWorkBodyTagSupport
    extends BodyTagSupport
@@ -70,8 +70,8 @@
 
    public void release()
    {
-      super.release();
       stack = null;
+      super.release();
    }
 }
 

Index: WebWorkTagSupport.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/WebWorkTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WebWorkTagSupport.java	8 May 2002 20:38:38 -0000	1.2
+++ WebWorkTagSupport.java	21 May 2002 03:30:43 -0000	1.3
@@ -15,10 +15,10 @@
 import java.io.PrintWriter;
 
 /**
- *	Base class for tags.
+ * Base class for tags.
  *
- *	@author Rickard Öberg ([email protected])
- *	@version $Revision$
+ * @author Rickard Öberg ([email protected])
+ * @version $Revision$
  */
 public abstract class WebWorkTagSupport
    extends TagSupport
@@ -68,8 +68,8 @@
 
    public void release()
    {
-      super.release();
       stack = null;
+      super.release();
    }
 }
 



_______________________________________________________________

Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm