You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/02/28 13:39:48 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/parser DefaultCookieParser.java
henning 2003/02/28 04:39:48
Modified: src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
src/java/org/apache/turbine/util CookieParser.java
DynamicURI.java
src/java/org/apache/turbine/util/parser
DefaultCookieParser.java
Log:
Remove all callers of the deprecated methods in BaseValueParser and
DefaultCookieParser.
Revision Changes Path
1.6 +3 -3 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultTurbineRunData.java 27 Feb 2003 14:13:41 -0000 1.5
+++ DefaultTurbineRunData.java 28 Feb 2003 12:39:48 -0000 1.6
@@ -505,9 +505,9 @@
{
// Parse the cookies first, if not yet done.
if ((this.cookies != null) &&
- (this.cookies.getRunData() != this))
+ (this.cookies.getRequest() != this.req))
{
- this.cookies.setRunData(this);
+ this.cookies.setData(this.req, this.res);
}
return this.cookies;
}
1.4 +24 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/CookieParser.java
Index: CookieParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/CookieParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CookieParser.java 12 Feb 2003 17:24:27 -0000 1.3
+++ CookieParser.java 28 Feb 2003 12:39:48 -0000 1.4
@@ -54,6 +54,9 @@
* <http://www.apache.org/>.
*/
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* CookieParser is an interface to a utility to to get and set values
* of Cookies on the Client Browser. You can use CookieParser to convert
@@ -91,16 +94,36 @@
* Gets the parsed RunData.
*
* @return the parsed RunData object or null.
+ * @deprecated. Don't use the Run Data object. use getRequest().
*/
RunData getRunData();
/**
+ * Gets the Request Object for this parser.
+ *
+ * @return the HttpServletRequest or null.
+ */
+ HttpServletRequest getRequest();
+
+ /**
* Sets the RunData to be parsed.
* All previous cookies will be cleared.
*
* @param data the RunData object.
+ * @deprecated. Use setData (HttpServletRequest request, HttpServletResponse response) instead
*/
void setRunData(RunData data);
+
+ /**
+ * Sets Request and Response to be parsed.
+ *
+ * All previous cookies will be cleared.
+ *
+ * @param request The http request from the servlet
+ * @param response The http reponse from the servlet
+ */
+ void setData(HttpServletRequest request,
+ HttpServletResponse response);
/**
* Get the Path where cookies will be stored
1.5 +5 -5 jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java
Index: DynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/DynamicURI.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicURI.java 12 Feb 2003 17:24:27 -0000 1.4
+++ DynamicURI.java 28 Feb 2003 12:39:48 -0000 1.5
@@ -62,7 +62,7 @@
import org.apache.ecs.html.A;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.parser.BaseValueParser;
+import org.apache.turbine.util.parser.ParserUtils;
/**
* This creates a Dynamic URI for use within the Turbine system
@@ -360,7 +360,7 @@
String value)
{
Object[] tmp = new Object[2];
- tmp[0] = (Object) BaseValueParser.convertAndTrim(name);
+ tmp[0] = (Object) ParserUtils.convertAndTrim(name);
tmp[1] = (Object) value;
switch (type)
{
@@ -679,7 +679,7 @@
e.hasMoreElements();)
{
Object[] tmp = (Object[]) e.nextElement();
- if (BaseValueParser.convertAndTrim(name)
+ if (ParserUtils.convertAndTrim(name)
.equals((String) tmp[0]))
{
this.pathInfo.removeElement(tmp);
@@ -695,7 +695,7 @@
e.hasMoreElements();)
{
Object[] tmp = (Object[]) e.nextElement();
- if (BaseValueParser.convertAndTrim(name)
+ if (ParserUtils.convertAndTrim(name)
.equals((String) tmp[0]))
{
this.queryData.removeElement(tmp);
1.8 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java
Index: DefaultCookieParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultCookieParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultCookieParser.java 28 Feb 2003 12:20:04 -0000 1.7
+++ DefaultCookieParser.java 28 Feb 2003 12:39:48 -0000 1.8
@@ -138,6 +138,7 @@
* @return the parsed RunData object or null.
* @deprecated. Don't use the Run Data object. use getRequest().
*/
+
public RunData getRunData()
{
return data;
@@ -166,6 +167,7 @@
*
* @param data the RunData object.
*/
+
public void setRunData(RunData data)
{
setData(data.getRequest(), data.getResponse());
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org