martinc 2003/08/12 08:03:42
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
SnoopAction.java
src/share/org/apache/struts/tiles DefinitionsUtil.java
src/share/org/apache/struts/tiles/definition
ReloadableDefinitionsFactory.java
src/share/org/apache/struts/util RequestUtils.java
Log:
Rename variables named 'enum' to avoid conflicts with the new 'enum'
keyword being introduced with J2SE 1.5.
PR: 22343
Submitted by: Robert Stupp
Revision Changes Path
1.2 +6 -6
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SnoopAction.java
Index: SnoopAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/SnoopAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SnoopAction.java 2 Jan 2003 19:42:45 -0000 1.1
+++ SnoopAction.java 12 Aug 2003 15:03:42 -0000 1.2
@@ -47,18 +47,18 @@
out.println("Context init parameters:");
ServletContext context = servlet.getServletContext();
- Enumeration enum = context.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ e = context.getInitParameterNames();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
Object value = context.getInitParameter(key);
out.println(" " + key + " = " + value);
}
out.println();
out.println("Context attributes:");
- enum = context.getAttributeNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ e = context.getAttributeNames();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
Object value = context.getAttribute(key);
out.println(" " + key + " = " + value);
}
1.14 +6 -6
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java
Index: DefinitionsUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsUtil.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefinitionsUtil.java 8 Jul 2003 23:55:35 -0000 1.13
+++ DefinitionsUtil.java 12 Aug 2003 15:03:42 -0000 1.14
@@ -336,9 +336,9 @@
// This implementation is very simple.
// It is possible to avoid creation of a new structure, but this need
// imply writing all Map interface.
- Enumeration enum = config.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ Enumeration e = config.getInitParameterNames();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
put(key, config.getInitParameter(key));
}
}
1.9 +7 -7
jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
Index: ReloadableDefinitionsFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ReloadableDefinitionsFactory.java 9 Jul 2003 00:14:01 -0000 1.8
+++ ReloadableDefinitionsFactory.java 12 Aug 2003 15:03:42 -0000 1.9
@@ -315,9 +315,9 @@
// This implementation is very simple.
// It is possible to avoid creation of a new structure, but this would
// imply writing all of the Map interface.
- Enumeration enum = config.getInitParameterNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ Enumeration e = config.getInitParameterNames();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
put(key, config.getInitParameter(key));
}
}
1.135 +10 -12
jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java
Index: RequestUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/RequestUtils.java,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- RequestUtils.java 2 Aug 2003 22:19:37 -0000 1.134
+++ RequestUtils.java 12 Aug 2003 15:03:42 -0000 1.135
@@ -957,20 +957,18 @@
HttpServletRequest request,
MultipartRequestHandler multipartHandler) {
Map parameters = new HashMap();
- Enumeration enum;
-
Hashtable elements = multipartHandler.getAllElements();
- enum = elements.keys();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ Enumeration e = elements.keys();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
parameters.put(key, elements.get(key));
}
if (request instanceof MultipartRequestWrapper) {
request = ((MultipartRequestWrapper)request).getRequest();
- enum = request.getParameterNames();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ e = request.getParameterNames();
+ while (e.hasMoreElements()) {
+ String key = (String) e.nextElement();
parameters.put(key, request.getParameterValues(key));
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
