dgraham 2003/07/25 16:51:31
Modified: src/share/org/apache/struts/validator Resources.java
Log:
Deprecated unused public constants and replaced them with private ones.
Revision Changes Path
1.16 +29 -10
jakarta-struts/src/share/org/apache/struts/validator/Resources.java
Index: Resources.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/validator/Resources.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Resources.java 2 Jul 2003 03:32:34 -0000 1.15
+++ Resources.java 25 Jul 2003 23:51:31 -0000 1.16
@@ -87,20 +87,39 @@
*/
public class Resources {
+ /**
+ * Resources key the <code>ServletContext</code> is stored under.
+ */
+ private static String SERVLET_CONTEXT_PARAM = "javax.servlet.ServletContext";
+
/**
* Resources key the <code>ServletContext</code> is stored under.
+ * @deprecated This will be removed after Struts 1.2
+ */
+ public static String SERVLET_CONTEXT_KEY = SERVLET_CONTEXT_PARAM;
+
+ /**
+ * Resources key the <code>HttpServletRequest</code> is stored under.
*/
- public static String SERVLET_CONTEXT_KEY = "javax.servlet.ServletContext";
+ private static String HTTP_SERVLET_REQUEST_PARAM =
+ "javax.servlet.http.HttpServletRequest";
/**
* Resources key the <code>HttpServletRequest</code> is stored under.
+ * @deprecated This will be removed after Struts 1.2
*/
- public static String HTTP_SERVLET_REQUEST_KEY =
"javax.servlet.http.HttpServletRequest";
+ public static String HTTP_SERVLET_REQUEST_KEY = HTTP_SERVLET_REQUEST_PARAM;
+
+ /**
+ * Resources key the <code>ActionErrors</code> is stored under.
+ */
+ private static String ACTION_ERRORS_PARAM =
"org.apache.struts.action.ActionErrors";
/**
* Resources key the <code>ActionErrors</code> is stored under.
+ * @deprecated This will be removed after Struts 1.2
*/
- public static String ACTION_ERRORS_KEY = "org.apache.struts.action.ActionErrors";
+ public static String ACTION_ERRORS_KEY = ACTION_ERRORS_PARAM;
/**
* Retrieve <code>ValidatorResources</code> for the current module.
@@ -271,10 +290,10 @@
validator.setPage(page);
- validator.addResource(SERVLET_CONTEXT_KEY, application);
- validator.addResource(HTTP_SERVLET_REQUEST_KEY, request);
+ validator.addResource(SERVLET_CONTEXT_PARAM, application);
+ validator.addResource(HTTP_SERVLET_REQUEST_PARAM, request);
validator.addResource(Validator.LOCALE_KEY, locale);
- validator.addResource(ACTION_ERRORS_KEY, errors);
+ validator.addResource(ACTION_ERRORS_PARAM, errors);
validator.addResource(Validator.BEAN_KEY, bean);
return validator;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
