felipeal 2004/10/23 18:30:23
Modified: framework/src/java/share-12-13-14/org/apache/cactus/server
AbstractServletConfigWrapper.java
AbstractServletContextWrapper.java
framework/src/java/share-13-14/org/apache/cactus/server
FilterConfigWrapper.java
samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit
TestServletConfig.java TestServletContext.java
Log:
replace enum by en, so it compiles under JDK 1.5
Revision Changes Path
1.2 +7 -7
jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractServletConfigWrapper.java
Index: AbstractServletConfigWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractServletConfigWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractServletConfigWrapper.java 22 May 2004 11:34:48 -0000 1.1
+++ AbstractServletConfigWrapper.java 24 Oct 2004 01:30:23 -0000 1.2
@@ -133,21 +133,21 @@
Vector names = new Vector();
// Add parameters that were added using setInitParameter()
- Enumeration enum = this.initParameters.keys();
+ Enumeration en = this.initParameters.keys();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
names.add(value);
}
// Add parameters from web.xml
- enum = this.originalConfig.getInitParameterNames();
+ en = this.originalConfig.getInitParameterNames();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
// Do not add parameters that have been overriden by calling
// the setInitParameter() method.
1.2 +7 -7
jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractServletContextWrapper.java
Index: AbstractServletContextWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share-12-13-14/org/apache/cactus/server/AbstractServletContextWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractServletContextWrapper.java 22 May 2004 11:34:48 -0000 1.1
+++ AbstractServletContextWrapper.java 24 Oct 2004 01:30:23 -0000 1.2
@@ -332,21 +332,21 @@
Vector names = new Vector();
// Add parameters that were added using setInitParameter()
- Enumeration enum = this.initParameters.keys();
+ Enumeration en = this.initParameters.keys();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
names.add(value);
}
// Add parameters from web.xml
- enum = this.originalContext.getInitParameterNames();
+ en = this.originalContext.getInitParameterNames();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
// Do not add parameters that have been overriden by calling
// the setInitParameter() method.
1.2 +7 -7
jakarta-cactus/framework/src/java/share-13-14/org/apache/cactus/server/FilterConfigWrapper.java
Index: FilterConfigWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/framework/src/java/share-13-14/org/apache/cactus/server/FilterConfigWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FilterConfigWrapper.java 22 May 2004 11:34:47 -0000 1.1
+++ FilterConfigWrapper.java 24 Oct 2004 01:30:23 -0000 1.2
@@ -120,21 +120,21 @@
Vector names = new Vector();
// Add parameters that were added using setInitParameter()
- Enumeration enum = this.initParameters.keys();
+ Enumeration en = this.initParameters.keys();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
names.add(value);
}
// Add parameters from web.xml
- enum = this.originalConfig.getInitParameterNames();
+ en = this.originalConfig.getInitParameterNames();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String value = (String) enum.nextElement();
+ String value = (String) en.nextElement();
if (!names.contains(value))
{
1.5 +7 -7
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestServletConfig.java
Index: TestServletConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestServletConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestServletConfig.java 29 Feb 2004 16:36:44 -0000 1.4
+++ TestServletConfig.java 24 Oct 2004 01:30:23 -0000 1.5
@@ -45,11 +45,11 @@
assertEquals("test value", config.getInitParameter("testparam"));
boolean found = false;
- Enumeration enum = config.getInitParameterNames();
+ Enumeration en = config.getInitParameterNames();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String name = (String) enum.nextElement();
+ String name = (String) en.nextElement();
if (name.equals("testparam"))
{
@@ -80,12 +80,12 @@
config.setInitParameter("param1", "testoverrideparam1");
- Enumeration enum = config.getInitParameterNames();
+ Enumeration en = config.getInitParameterNames();
int count = 0;
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String name = (String) enum.nextElement();
+ String name = (String) en.nextElement();
if (name.equals("param1"))
{
1.3 +7 -7
jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestServletContext.java
Index: TestServletContext.java
===================================================================
RCS file:
/home/cvs/jakarta-cactus/samples/servlet/src/test-cactus/share/org/apache/cactus/sample/servlet/unit/TestServletContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestServletContext.java 29 Feb 2004 16:36:44 -0000 1.2
+++ TestServletContext.java 24 Oct 2004 01:30:23 -0000 1.3
@@ -55,11 +55,11 @@
assertEquals("test value", context.getInitParameter("testparam"));
boolean found = false;
- Enumeration enum = context.getInitParameterNames();
+ Enumeration en = context.getInitParameterNames();
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String name = (String) enum.nextElement();
+ String name = (String) en.nextElement();
if (name.equals("testparam"))
{
@@ -91,12 +91,12 @@
context.setInitParameter("param", "testoverrideparam");
- Enumeration enum = context.getInitParameterNames();
+ Enumeration en = context.getInitParameterNames();
int count = 0;
- while (enum.hasMoreElements())
+ while (en.hasMoreElements())
{
- String name = (String) enum.nextElement();
+ String name = (String) en.nextElement();
if (name.equals("param"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
