dims 2005/08/20 19:45:11
Modified: java/src/org/apache/axis/wsdl/toJava JavaBeanWriter.java
Log:
Fix for AXIS-2164 - classes generated by wsdl2java don't compile
Notes:
fix for the original problem reported by Yves.
Revision Changes Path
1.80 +5 -4
ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
Index: JavaBeanWriter.java
===================================================================
RCS file:
/home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- JavaBeanWriter.java 13 Jul 2005 06:05:11 -0000 1.79
+++ JavaBeanWriter.java 21 Aug 2005 02:45:11 -0000 1.80
@@ -22,9 +22,6 @@
import org.apache.axis.wsdl.symbolTable.ElementDecl;
import org.apache.axis.wsdl.symbolTable.SchemaUtils;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
-import org.apache.axis.wsdl.symbolTable.CollectionTE;
-import org.apache.axis.wsdl.symbolTable.BaseType;
-import org.apache.axis.wsdl.symbolTable.DefinedElement;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
@@ -378,6 +375,11 @@
names.add(variableName);
}
+ if((extendType != null) && (Utils.getEnumerationBaseAndValues(
+ extendType.getNode(), emitter.getSymbolTable()) !=
null)){
+ enableDefaultConstructor = false;
+ }
+
// Check for duplicate names and make them unique
// Start at index 2 and go by twos
for (int i = 1; i < names.size(); i +=2)
@@ -566,7 +568,6 @@
* Writes the default constructor.
*/
protected void writeDefaultConstructor() {
-
// Define the default constructor
pw.println(" public " + className + "() {");
pw.println(" }");