axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl/fromJava Types.java
Date Mon, 29 Jul 2002 15:02:33 GMT
gdaniels    2002/07/29 08:02:33

  Modified:    java/src/org/apache/axis/wsdl/fromJava Types.java
  Log:
  Remove buggy code (we shouldn't be producing any schema at all for
  xsd/soap-enc types - that's the job of those schemas!).
  
  Revision  Changes    Path
  1.49      +18 -20    xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
  
  Index: Types.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Types.java	25 Jul 2002 16:42:05 -0000	1.48
  +++ Types.java	29 Jul 2002 15:02:32 -0000	1.49
  @@ -243,32 +243,30 @@
           if (type.getName().equals("void")) {
             return null;
           }
  +
           if (Holder.class.isAssignableFrom(type)) {
               type = JavaUtils.getHolderValueType(type);
           }
  +
  +        /**
  +         * No need to do anything if this is a simple type (i.e. in the
  +         * xsd or soap-enc schemas already)
  +         */
           if (isSimpleType(type)) {
  -            // Still need to write any element declaration...
  -            if (qname != null) {
  -                String elementType = writeType(type, qname);
  -                Element element = createElementDecl(qname, elementType, false);
  -                if (element != null) {
  -                    writeSchemaElement(qname,element);
  -                }
  -            }
  -            return qname;
  -        }else {
  -            if (wsdlTypesElem == null) {
  -                writeWsdlTypesElement();
  -            }
  -            // If writeTypeAsElement returns null, then
  -            // then no element was written due to problems.
  -            // return an anytype in such situations.
  -            qname = writeTypeAsElement(type, qname);
  -            if (qname == null) {
  -                qname = Constants.XSD_ANYTYPE;
  -            }
               return qname;
           }
  +
  +        if (wsdlTypesElem == null) {
  +            writeWsdlTypesElement();
  +        }
  +        // If writeTypeAsElement returns null, then
  +        // then no element was written due to problems.
  +        // return an anytype in such situations.
  +        qname = writeTypeAsElement(type, qname);
  +        if (qname == null) {
  +            qname = Constants.XSD_ANYTYPE;
  +        }
  +        return qname;
       }
   
       /**
  
  
  

Mime
View raw message