webwork/src/main/webwork/view/taglib ActionTag.java,1.7,1.8 BeanTag.java,1.4,1.5 ElseIfTag.java,1.5,1.6 ElseTag.java,1.4,1.5 I18nTag.java,1.4,1.5 IfTag.java,1.6,1.7 IncludeTag.java,1.5,1.6 IteratorTag.java,1.3,1.4 ParamTag.java,1.4,1.5 PropertyTag.java,1.9,1.10 TextTag.java,1.5,1.6 URLTag.java,1.7,1.8 WebWorkBodyTagSupport.java,1.4,1.5 WebWorkTagSupport.java,1.3,1.4
[email protected] Thu, 30 May 2002 15:57:50 -0700
| Newsgroups | gmane.comp.java.webwork.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/webwork/webwork/src/main/webwork/view/taglib
In directory usw-pr-cvs1:/tmp/cvs-serv29705
Modified Files:
ActionTag.java BeanTag.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:
removed release()
Index: ActionTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ActionTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ActionTag.java 27 May 2002 11:21:51 -0000 1.7
+++ ActionTag.java 30 May 2002 22:57:47 -0000 1.8
@@ -148,12 +148,4 @@
return EVAL_PAGE;
}
-
- public void release()
- {
- oldContext = null;
- context = null;
- bean = null;
- super.release();
- }
}
Index: BeanTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/BeanTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BeanTag.java 27 May 2002 18:14:36 -0000 1.4
+++ BeanTag.java 30 May 2002 22:57:47 -0000 1.5
@@ -90,11 +90,4 @@
getStack().popValue();
return EVAL_PAGE;
}
-
- public void release()
- {
- bean=null;
- nameAttr=null;
- super.release();
- }
}
Index: ElseIfTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ElseIfTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ElseIfTag.java 21 May 2002 03:30:43 -0000 1.5
+++ ElseIfTag.java 30 May 2002 22:57:47 -0000 1.6
@@ -55,6 +55,8 @@
pageContext.setAttribute(IfTag.ANSWER, new Boolean(answer));
}
+ setId(null);
+ answer=false;
return EVAL_PAGE;
}
@@ -62,16 +64,8 @@
super.setParent(t);
// Reset
- test = null;
- answer = false;
- }
-
- public void release() {
- setId(null);
-
- // Reset
- test = null;
- super.release();
+ //test = null;
+ //answer = false;
}
}
Index: ElseTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/ElseTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ElseTag.java 21 May 2002 03:30:43 -0000 1.4
+++ ElseTag.java 30 May 2002 22:57:47 -0000 1.5
@@ -32,13 +32,10 @@
}
}
- public void setParent(Tag t) {
- super.setParent(t);
- }
-
- public void release() {
+ public int doEndTag() throws JspException
+ {
setId(null);
- super.release();
+ return super.doEndTag();
}
}
Index: I18nTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/I18nTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- I18nTag.java 21 May 2002 03:30:43 -0000 1.4
+++ I18nTag.java 30 May 2002 22:57:47 -0000 1.5
@@ -96,12 +96,6 @@
return bundle.getString(aName);
}
}
-
- public void release()
- {
- nameAttr = null;
- super.release();
- }
}
Index: IfTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/IfTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- IfTag.java 21 May 2002 03:30:43 -0000 1.6
+++ IfTag.java 30 May 2002 22:57:47 -0000 1.7
@@ -49,23 +49,13 @@
pageContext.setAttribute(getId(), new Boolean(answer));
}
pageContext.setAttribute(IfTag.ANSWER, new Boolean(answer));
+ answer=false;
+ setId(null);
return EVAL_PAGE;
}
public void setParent(Tag t) {
- super.setParent(t);
- // Reset
- test = null;
- }
-
- public void release() {
- setId(null);
-
- // Reset
- test = null;
- answer = false;
- super.release();
- }
+ super.setParent(t);
}
}
Index: IncludeTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/IncludeTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- IncludeTag.java 21 May 2002 03:30:43 -0000 1.5
+++ IncludeTag.java 30 May 2002 22:57:47 -0000 1.6
@@ -243,14 +243,6 @@
jspWriter.write(new String(b, off, len));
}
}
-
- public void 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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IteratorTag.java 21 May 2002 03:30:43 -0000 1.3
+++ IteratorTag.java 30 May 2002 22:57:47 -0000 1.4
@@ -187,20 +187,6 @@
return SKIP_BODY;
}
}
-
- public void release()
- {
- valueAttr = null;
- statusAttr = null;
- currentValue = null;
- iterator = null;
- status = null;
- 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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ParamTag.java 21 May 2002 03:30:43 -0000 1.4
+++ ParamTag.java 30 May 2002 22:57:47 -0000 1.5
@@ -74,13 +74,6 @@
return EVAL_PAGE;
}
- public void release()
- {
- nameAttr = null;
- valueAttr = null;
- super.release();
- }
-
// Inner classes -------------------------------------------------
public interface Parametric
{
Index: PropertyTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/PropertyTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PropertyTag.java 27 May 2002 18:10:41 -0000 1.9
+++ PropertyTag.java 30 May 2002 22:57:47 -0000 1.10
@@ -14,6 +14,8 @@
import javax.servlet.jsp.PageContext;
import java.util.Iterator;
+import org.apache.log4j.Category;
+
/**
* Access the value of a named property. By default (implicitly),
* this tag will escape its contents if it does *not* have a body.
@@ -56,7 +58,6 @@
pageContext.setAttribute(id, value);
pageContext.setAttribute(id, value, PageContext.REQUEST_SCOPE);
}
-
return EVAL_BODY_TAG;
}
@@ -135,12 +136,6 @@
hadBody=false;
return EVAL_PAGE;
- }
-
- public void release()
- {
- valueAttr = null;
- super.release();
}
}
Index: TextTag.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/TextTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TextTag.java 21 May 2002 03:30:43 -0000 1.5
+++ TextTag.java 30 May 2002 22:57:47 -0000 1.6
@@ -171,16 +171,6 @@
return EVAL_PAGE;
}
-
- public void 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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- URLTag.java 21 May 2002 03:30:43 -0000 1.7
+++ URLTag.java 30 May 2002 22:57:47 -0000 1.8
@@ -158,15 +158,6 @@
return EVAL_PAGE;
}
-
- public void 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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- WebWorkBodyTagSupport.java 21 May 2002 03:30:43 -0000 1.4
+++ WebWorkBodyTagSupport.java 30 May 2002 22:57:47 -0000 1.5
@@ -43,8 +43,9 @@
// Protected -----------------------------------------------------
protected ValueStack getStack()
{
- if (stack == null)
+ if (stack == null) {
stack = ValueStack.getStack(pageContext);
+ }
return stack;
}
@@ -66,12 +67,6 @@
t.printStackTrace(wrt);
wrt.close();
return bout.toString();
- }
-
- public void release()
- {
- stack = null;
- super.release();
}
}
Index: WebWorkTagSupport.java
===================================================================
RCS file: /cvsroot/webwork/webwork/src/main/webwork/view/taglib/WebWorkTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WebWorkTagSupport.java 21 May 2002 03:30:43 -0000 1.3
+++ WebWorkTagSupport.java 30 May 2002 22:57:47 -0000 1.4
@@ -65,12 +65,6 @@
wrt.close();
return bout.toString();
}
-
- public void 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