stevel 2003/08/13 12:08:24
Modified: java/src/org/apache/axis/wsdl/toJava JavaEnumTypeWriter.java
java/src/org/apache/axis/message SOAPHeader.java
SOAPEnvelope.java SOAPBody.java
java/src/org/apache/axis/i18n RB.java
java/src/org/apache/axis/handlers/soap SOAPService.java
java/src/org/apache/axis/enum Scope.java Enum.java
java/src/org/apache/axis SimpleChain.java
FaultableHandler.java
Log:
Replace variables called 'enum' by variables called anything else. In Java1.5, enum
is a keyword.
Not addressed: the axis.enum package. It'd be trivial in intellij to do the
migration, but would complicate the patch process for ages. It will need to be done
before Java1.5 ships.
Revision Changes Path
1.24 +3 -3
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
Index: JavaEnumTypeWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JavaEnumTypeWriter.java 18 Jun 2003 23:01:52 -0000 1.23
+++ JavaEnumTypeWriter.java 13 Aug 2003 19:08:22 -0000 1.24
@@ -185,15 +185,15 @@
// FromValue returns the unique enumeration value object from the table
pw.println(" public static " + javaName+ " fromValue(" + baseType +"
value)");
pw.println(" throws java.lang.IllegalStateException {");
- pw.println(" "+javaName+" enum = ("+javaName+")");
+ pw.println(" "+javaName+" enumeration = ("+javaName+")");
if (baseClass.equals("java.lang.String") ||
baseClass.equals(baseType)) {
pw.println(" _table_.get(value);");
} else {
pw.println(" _table_.get(new " + baseClass + "(value));");
}
- pw.println(" if (enum==null) throw new
java.lang.IllegalStateException();");
- pw.println(" return enum;");
+ pw.println(" if (enumeration==null) throw new
java.lang.IllegalStateException();");
+ pw.println(" return enumeration;");
pw.println(" }");
// FromString returns the unique enumeration value object from a string
representation
1.76 +3 -3 xml-axis/java/src/org/apache/axis/message/SOAPHeader.java
Index: SOAPHeader.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPHeader.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- SOAPHeader.java 8 Jul 2003 18:27:58 -0000 1.75
+++ SOAPHeader.java 13 Aug 2003 19:08:22 -0000 1.76
@@ -350,10 +350,10 @@
// Output <SOAP-ENV:Header>
context.startElement(new QName(soapConstants.getEnvelopeURI(),
Constants.ELEM_HEADER), null);
- Enumeration enum = headers.elements();
- while (enum.hasMoreElements()) {
+ Enumeration enumeration = headers.elements();
+ while (enumeration.hasMoreElements()) {
// Output this header element
- ((SOAPHeaderElement)enum.nextElement()).output(context);
+ ((SOAPHeaderElement)enumeration.nextElement()).output(context);
}
// Output </SOAP-ENV:Header>
context.endElement();
1.92 +4 -4 xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java
Index: SOAPEnvelope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPEnvelope.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- SOAPEnvelope.java 18 Jun 2003 23:01:51 -0000 1.91
+++ SOAPEnvelope.java 13 Aug 2003 19:08:23 -0000 1.92
@@ -483,7 +483,7 @@
}
}
- Enumeration enum;
+ Enumeration enumeration;
// Output <SOAP-ENV:Envelope>
context.startElement(new QName(soapConstants.getEnvelopeURI(),
@@ -510,9 +510,9 @@
}
// Output trailers
- enum = trailers.elements();
- while (enum.hasMoreElements()) {
- MessageElement element = (MessageElement)enum.nextElement();
+ enumeration = trailers.elements();
+ while (enumeration.hasMoreElements()) {
+ MessageElement element = (MessageElement)enumeration.nextElement();
element.output(context);
// Output this independent element
}
1.46 +3 -3 xml-axis/java/src/org/apache/axis/message/SOAPBody.java
Index: SOAPBody.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/SOAPBody.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- SOAPBody.java 8 Jul 2003 18:27:58 -0000 1.45
+++ SOAPBody.java 13 Aug 2003 19:08:23 -0000 1.46
@@ -170,9 +170,9 @@
// Output <SOAP-ENV:Body>
context.startElement(new QName(soapConstants.getEnvelopeURI(),
Constants.ELEM_BODY), getAttributesEx());
- Enumeration enum = bodyElements.elements();
- while (enum.hasMoreElements()) {
- SOAPBodyElement body = (SOAPBodyElement)enum.nextElement();
+ Enumeration enumeration = bodyElements.elements();
+ while (enumeration.hasMoreElements()) {
+ SOAPBodyElement body = (SOAPBodyElement)enumeration.nextElement();
body.output(context);
// Output this body element.
}
1.3 +3 -3 xml-axis/java/src/org/apache/axis/i18n/RB.java
Index: RB.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/i18n/RB.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RB.java 22 Apr 2003 19:35:06 -0000 1.2
+++ RB.java 13 Aug 2003 19:08:23 -0000 1.3
@@ -420,9 +420,9 @@
}
// Now merge. p1 takes precedence
- Enumeration enum = p2.keys();
- while (enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ Enumeration enumeration = p2.keys();
+ while (enumeration.hasMoreElements()) {
+ String key = (String) enumeration.nextElement();
if (p1.getProperty(key) == null) {
p1.put(key, p2.getProperty(key));
}
1.104 +6 -6 xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
Index: SOAPService.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- SOAPService.java 10 Aug 2003 00:57:30 -0000 1.103
+++ SOAPService.java 13 Aug 2003 19:08:23 -0000 1.104
@@ -217,9 +217,9 @@
SOAPEnvelope env = msgContext.getRequestMessage().getSOAPEnvelope();
Vector headers = env.getHeadersByActor(acts);
Vector misunderstoodHeaders = null;
- Enumeration enum = headers.elements();
- while (enum.hasMoreElements()) {
- SOAPHeaderElement header = (SOAPHeaderElement)enum.
+ Enumeration enumeration = headers.elements();
+ while (enumeration.hasMoreElements()) {
+ SOAPHeaderElement header = (SOAPHeaderElement)enumeration.
nextElement();
if (header.getMustUnderstand() && !header.isProcessed()) {
if (misunderstoodHeaders == null)
@@ -243,9 +243,9 @@
// !!! If SOAP 1.2, insert misunderstood fault headers here
if (soapConstants == SOAPConstants.SOAP12_CONSTANTS) {
- enum = misunderstoodHeaders.elements();
- while (enum.hasMoreElements()) {
- SOAPHeaderElement badHeader = (SOAPHeaderElement)enum.
+ enumeration = misunderstoodHeaders.elements();
+ while (enumeration.hasMoreElements()) {
+ SOAPHeaderElement badHeader =
(SOAPHeaderElement)enumeration.
nextElement();
QName badQName = new QName(badHeader.getNamespaceURI(),
badHeader.getName());
1.8 +0 -7 xml-axis/java/src/org/apache/axis/enum/Scope.java
Index: Scope.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/enum/Scope.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Scope.java 22 Apr 2003 19:34:39 -0000 1.7
+++ Scope.java 13 Aug 2003 19:08:23 -0000 1.8
@@ -129,13 +129,6 @@
return (Scope)this.getEnum(scope, dephault);
}
- // public final String getName();
- // public boolean isValid(String enumName);
- // public final int size();
- // public final String[] getEnumNames();
- // public final Enum getEnum(int enum);
- // public final Enum getEnum(String enumName);
- // public final Enum getEnum(String enumName, Enum dephault);
}
private Scope(int value, String name) {
1.15 +6 -6 xml-axis/java/src/org/apache/axis/enum/Enum.java
Index: Enum.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/enum/Enum.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Enum.java 1 Jul 2003 01:22:11 -0000 1.14
+++ Enum.java 13 Aug 2003 19:08:23 -0000 1.15
@@ -148,8 +148,8 @@
}
public final boolean isValid(String enumName) {
- for (int enum = 0; enum < enums.length; enum++) {
- if (enums[enum].getName().equalsIgnoreCase(enumName))
+ for (int enumElt = 0; enumElt < enums.length; enumElt++) {
+ if (enums[enumElt].getName().equalsIgnoreCase(enumName))
return true;
}
@@ -175,8 +175,8 @@
/**
* Returns name of enumerated value
*/
- public final Enum getEnum(int enum) {
- return (enum >= 0 && enum < enums.length) ? enums[enum] : null;
+ public final Enum getEnum(int enumElt) {
+ return (enumElt >= 0 && enumElt < enums.length) ? enums[enumElt] :
null;
}
/**
@@ -201,8 +201,8 @@
*/
public final Enum getEnum(String enumName, Enum dephault) {
if (enumName != null && enumName.length() > 0) {
- for (int enum = 0; enum < enums.length; enum++) {
- Enum e = enums[enum];
+ for (int enumElt = 0; enumElt < enums.length; enumElt++) {
+ Enum e = enums[enumElt];
if (e.getName().equalsIgnoreCase(enumName))
return e;
}
1.59 +3 -3 xml-axis/java/src/org/apache/axis/SimpleChain.java
Index: SimpleChain.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/SimpleChain.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- SimpleChain.java 22 Jul 2003 19:28:13 -0000 1.58
+++ SimpleChain.java 13 Aug 2003 19:08:24 -0000 1.59
@@ -145,9 +145,9 @@
HandlerIterationStrategy visitor) throws AxisFault {
int i = 0 ;
try {
- Enumeration enum = handlers.elements();
- while (enum.hasMoreElements()) {
- visitor.visit((Handler)enum.nextElement(), msgContext);
+ Enumeration enumeration = handlers.elements();
+ while (enumeration.hasMoreElements()) {
+ visitor.visit((Handler)enumeration.nextElement(), msgContext);
i++;
}
} catch( AxisFault f ) {
1.49 +3 -3 xml-axis/java/src/org/apache/axis/FaultableHandler.java
Index: FaultableHandler.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/FaultableHandler.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- FaultableHandler.java 22 Apr 2003 19:33:59 -0000 1.48
+++ FaultableHandler.java 13 Aug 2003 19:08:24 -0000 1.49
@@ -132,9 +132,9 @@
Hashtable options = getOptions();
if (options != null) {
- Enumeration enum = options.keys();
- while (enum.hasMoreElements()) {
- String s = (String) enum.nextElement();
+ Enumeration enumeration = options.keys();
+ while (enumeration.hasMoreElements()) {
+ String s = (String) enumeration.nextElement();
if (s.equals("fault-" + fault.getFaultCode().getLocalPart())) {
faultHandler = (Handler)options.get(s);
}
