Author: darran.lofthouse(a)jboss.com Date: 2008-03-27 13:18:26 -0400 (Thu, 27 Mar 2008) New Revision: 6131 Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java Log: Further compliation fixes. Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 17:17:41 UTC (rev 6130) +++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/XSDToJava.java 2008-03-27 17:18:26 UTC (rev 6131) @@ -55,7 +55,7 @@ /** * Utility class that converts a XSD Type into a Java class */ - protected XSDTypeToJava xsdJava = new XSDTypeToJava(null); + protected final XSDTypeToJava xsdJava = new XSDTypeToJava(null, false); private LiteralTypeMapping typeMapping = null; @@ -106,7 +106,6 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - checkXSDTypeToJava(); xsdJava.createJavaFile(ctype, dirloc.getPath(), packageName, xsmodel); } else if (type instanceof XSSimpleTypeDefinition) @@ -116,7 +115,6 @@ String nsuri = type.getNamespace(); String tname = type.getName(); if (Constants.NS_SCHEMA_XSD.equals(nsuri) && "anyType".equals(tname)) continue; - checkXSDTypeToJava(); xsdJava.createJavaFile(stype, dirloc.getPath(), packageName, xsmodel); } } @@ -158,16 +156,9 @@ String str = "Method should be used for anon complex types only"; if (type.getName() != null) throw new IllegalArgumentException(str); - checkXSDTypeToJava(); xsdJava.createJavaFile(type,outerElementName,loc.getPath(),pkgname,schema, false); } - private void checkXSDTypeToJava() - { - if(xsdJava == null) - xsdJava = new XSDTypeToJava(null); - xsdJava.setTypeMapping(typeMapping); - } } Modified: stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java =================================================================== --- stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 17:17:41 UTC (rev 6130) +++ stack/native/branches/dlofthouse/JBWS-1278/src/main/java/org/jboss/ws/tools/mapping/MappingFileGenerator.java 2008-03-27 17:18:26 UTC (rev 6131) @@ -225,43 +225,6 @@ return jwm; } - public void generateJavaSourceFileForRequestResponseStruct(File location, ServiceEndpointInterfaceMapping seim, JBossXSModel xsmodel, String typeNamespace) - throws IOException - { - WSDLUtils utils = WSDLUtils.getInstance(); - XSDTypeToJava xst = new XSDTypeToJava(namespacePackageMap); - xst.setTypeMapping(this.typeMapping); - xst.setPackageName(getPackageName(typeNamespace)); - ServiceEndpointMethodMapping[] mapArr = seim.getServiceEndpointMethodMappings(); - int len = mapArr != null ? mapArr.length : 0; - for (int i = 0; i < len; i++) - { - ServiceEndpointMethodMapping mm = mapArr[i]; - String opname = mm.getJavaMethodName(); - String sei = seim.getServiceEndpointInterface(); - String plainClassName = utils.getJustClassName(sei); - String classname = plainClassName + "_" + opname + "_RequestStruct"; - List<VAR> listInputs = new ArrayList<VAR>(); - MethodParamPartsMapping[] mppmarr = mm.getMethodParamPartsMappings(); - int lenmppmarr = mppmarr != null ? mppmarr.length : 0; - for (int j = 0; j < lenmppmarr; j++) - { - listInputs.addAll(xst.getVARList((XSComplexTypeDefinition)xsmodel.getTypeDefinition(opname, typeNamespace), xsmodel, false)); - } - JavaWriter jw = new JavaWriter(); - jw.createJavaFile(location, classname, getPackageName(typeNamespace), listInputs, null, null, false, null); - classname = plainClassName + "_" + opname + "_ResponseStruct"; - XSTypeDefinition xt = xsmodel.getTypeDefinition(opname + "Response", typeNamespace); - List<VAR> listOutputs = new ArrayList<VAR>(); - if (xt instanceof XSSimpleTypeDefinition) - { - listOutputs.add(new VAR(Constants.DEFAULT_RPC_RETURN_NAME, xt.getName(), false)); - } - else listOutputs.addAll(xst.getVARList((XSComplexTypeDefinition)xt, xsmodel, false)); - jw.createJavaFile(location, classname, getPackageName(typeNamespace), listOutputs, null, null, false, null); - } - } - //PRIVATE METHODS private boolean isServerSideGeneration() {