tomj 2002/06/27 11:51:38
Modified: java/src/org/apache/axis/wsdl/toJava
JavaBeanHelperWriter.java Emitter.java
Log:
Fix bug 10292: Generated file info contains Helper class even when not generated.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10292
Override the regsiterFile routine for JavaBeanHelperWriter.
Also fix a javadoc comment in Emitter.
Revision Changes Path
1.14 +9 -0
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
Index: JavaBeanHelperWriter.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JavaBeanHelperWriter.java 11 Jun 2002 14:54:01 -0000 1.13
+++ JavaBeanHelperWriter.java 27 Jun 2002 18:51:37 -0000 1.14
@@ -125,6 +125,15 @@
} // getPrintWriter
/**
+ * Only register the filename if the bean helper is not wrapped
+ * within a bean.
+ */
+ protected void registerFile(String file) {
+ if (wrapperPW == null)
+ super.registerFile(file);
+ } // registerFile
+
+ /**
* Only write the file header if the bean helper is not wrapped
* within a bean.
*/
1.45 +1 -1 xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
Index: Emitter.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Emitter.java 20 Jun 2002 20:35:47 -0000 1.44
+++ Emitter.java 27 Jun 2002 18:51:38 -0000 1.45
@@ -304,7 +304,7 @@
* Returns an object which contains of information on all generated files
* including the class name, filename and a type string.
*
- * @return Anorg.apache.axis.wsdl.toJava.GeneratedFileInfo object
+ * @return An org.apache.axis.wsdl.toJava.GeneratedFileInfo object
* @see org.apache.axis.wsdl.toJava.GeneratedFileInfo
*/
public GeneratedFileInfo getGeneratedFileInfo()
