[Jboss-svn-commits] JBossWS SVN: r508 - branches/jbossws-1.0/src/main/java/org/jboss/ws/tools

[<jbo...@li...>]

Author: jas...@jb...
Date: 2006-06-28 20:30:35 -0400 (Wed, 28 Jun 2006)
New Revision: 508

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
revert eroneous merge


Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2006-06-28 14:10:36 UTC (rev 507)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java	2006-06-29 00:30:35 UTC (rev 508)
@@ -358,7 +358,7 @@
             if (! xt.getAnonymous())
                xt = xsmodel.getTypeDefinition(xt.getName(), xt.getNamespace());
             if(xt instanceof XSComplexTypeDefinition)
-               generateJavaSourceForException((XSComplexTypeDefinition)xt,xsmodel);
+               generateJavaSource((XSComplexTypeDefinition)xt,xsmodel, faultXMLName.getLocalPart(), true);
 
             Class cl = getJavaType(faultXMLType, false);
             if (cl == null)
@@ -563,15 +563,13 @@
 
    private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
    {
-      XSDTypeToJava xtj = new XSDTypeToJava();
-      xtj.setTypeMapping(this.typeMapping);
-      xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, false);
+      generateJavaSource(xt, xsmodel, containingElement, false);
    }
 
-   private void generateJavaSourceForException(XSComplexTypeDefinition xt, JBossXSModel xsmodel) throws IOException
+   private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement, boolean exception) throws IOException
    {
       XSDTypeToJava xtj = new XSDTypeToJava();
       xtj.setTypeMapping(this.typeMapping);
-      xtj.createJavaFile((XSComplexTypeDefinition)xt, null,getLocationForJavaGeneration(),seiPkgName,xsmodel,true);
+      xtj.createJavaFile((XSComplexTypeDefinition)xt, containingElement, getLocationForJavaGeneration(), seiPkgName, xsmodel, exception);
    }
-}
+}
\ No newline at end of file