remm 2004/07/23 15:41:32
Modified: catalina/src/share/org/apache/catalina/servlets
WebdavServlet.java DefaultServlet.java
Log:
- enum -> enumeration (JDK 1.5 update).
Revision Changes Path
1.16 +11 -11
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- WebdavServlet.java 13 Jul 2004 09:43:19 -0000 1.15
+++ WebdavServlet.java 23 Jul 2004 22:41:32 -0000 1.16
@@ -499,10 +499,10 @@
if ((object instanceof DirContext) && (depth > 0)) {
try {
- NamingEnumeration enum = resources.list(currentPath);
- while (enum.hasMoreElements()) {
+ NamingEnumeration enumeration = resources.list(currentPath);
+ while (enumeration.hasMoreElements()) {
NameClassPair ncPair =
- (NameClassPair) enum.nextElement();
+ (NameClassPair) enumeration.nextElement();
String newPath = currentPath;
if (!(newPath.endsWith("/")))
newPath += "/";
@@ -1597,9 +1597,9 @@
}
try {
- NamingEnumeration enum = resources.list(source);
- while (enum.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enum.nextElement();
+ NamingEnumeration enumeration = resources.list(source);
+ while (enumeration.hasMoreElements()) {
+ NameClassPair ncPair = (NameClassPair)
enumeration.nextElement();
String childDest = dest;
if (!childDest.equals("/"))
childDest += "/";
@@ -1769,17 +1769,17 @@
if (lockTokenHeader == null)
lockTokenHeader = "";
- Enumeration enum = null;
+ Enumeration enumeration = null;
try {
- enum = resources.list(path);
+ enumeration = resources.list(path);
} catch (NamingException e) {
errorList.put(path, new Integer
(WebdavStatus.SC_INTERNAL_SERVER_ERROR));
return;
}
- while (enum.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
String childName = path;
if (!childName.equals("/"))
childName += "/";
1.26 +7 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- DefaultServlet.java 13 Jul 2004 15:04:37 -0000 1.25
+++ DefaultServlet.java 23 Jul 2004 22:41:32 -0000 1.26
@@ -1205,10 +1205,10 @@
// Render the directory entries within this directory
DirContext directory = cacheEntry.context;
- NamingEnumeration enum = resources.list(cacheEntry.name);
- while (enum.hasMoreElements()) {
+ NamingEnumeration enumeration = resources.list(cacheEntry.name);
+ while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enum.nextElement();
+ NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
String resourceName = ncPair.getName();
CacheEntry childCacheEntry =
resources.lookupCache(cacheEntry.name + resourceName);
@@ -1374,11 +1374,11 @@
// Render the directory entries within this directory
DirContext directory = cacheEntry.context;
- NamingEnumeration enum = resources.list(cacheEntry.name);
+ NamingEnumeration enumeration = resources.list(cacheEntry.name);
boolean shade = false;
- while (enum.hasMoreElements()) {
+ while (enumeration.hasMoreElements()) {
- NameClassPair ncPair = (NameClassPair) enum.nextElement();
+ NameClassPair ncPair = (NameClassPair) enumeration.nextElement();
String resourceName = ncPair.getName();
CacheEntry childCacheEntry =
resources.lookupCache(cacheEntry.name + resourceName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
