dims 2003/03/14 07:36:06
Modified: java/src/org/apache/axis/utils JavaUtils.java
java/test/utils TestJavaUtils.java
Log:
Fix for Bug 17994 - wsdl2java generates code with reserved words as variable names
Revision Changes Path
1.97 +2 -1 xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
Index: JavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- JavaUtils.java 28 Feb 2003 20:28:58 -0000 1.96
+++ JavaUtils.java 14 Mar 2003 15:36:06 -0000 1.97
@@ -619,10 +619,11 @@
*
http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
* Note that false, true, and null are not strictly keywords; they are literal
values,
* but for the purposes of this array, they can be treated as literals.
+ * ****** PLEASE KEEP THIS LIST SORTED IN ASCENDING ORDER ******
*/
static final String keywords[] =
{
- "assert", "abstract", "boolean", "break", "byte", "case",
+ "abstract", "assert", "boolean", "break", "byte",
"case",
"catch", "char", "class", "const", "continue",
"default", "do", "double", "else", "extends",
"false", "final", "finally", "float", "for",
1.19 +7 -0 xml-axis/java/test/utils/TestJavaUtils.java
Index: TestJavaUtils.java
===================================================================
RCS file: /home/cvs/xml-axis/java/test/utils/TestJavaUtils.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TestJavaUtils.java 5 Mar 2003 15:19:43 -0000 1.18
+++ TestJavaUtils.java 14 Mar 2003 15:36:06 -0000 1.19
@@ -101,6 +101,13 @@
}
/**
+ * Test for Bug 17994 - wsdl2java generates code with reserved words as
variable names
+ */
+ public void testXmlNameToJava2() {
+ assertEquals("_abstract", JavaUtils.xmlNameToJava("abstract"));
+ }
+
+ /**
* test the convert() function
* verify that we can convert to the Collection, List, and Set interfaces
*/
