cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava JavaBeanHelperWriter.java JavaStubWriter.java

[dims]

dims        2003/07/10 16:10:53

  Modified:    java/src/org/apache/axis/wsdl/toJava
                        JavaBeanHelperWriter.java JavaStubWriter.java
  Log:
  - Rollback unnecessary changes to JavaBeanHelperWriter
  - Fix JavaStubWriter to generate static methods which are called from the static 
block.
  as per latest patch from Jan Hrabowski ([EMAIL PROTECTED])
  
  Revision  Changes    Path
  1.41      +0 -9      
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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- JavaBeanHelperWriter.java 10 Jul 2003 16:43:24 -0000      1.40
  +++ JavaBeanHelperWriter.java 10 Jul 2003 23:10:53 -0000      1.41
  @@ -237,10 +237,6 @@
                   boolean wroteAttrDecl = false;
   
                   for (int i = 0; i < attributes.size(); i += 2) {
  -                    if(((i+1)%10) == 0) {
  -                        pw.println("    }");
  -                        pw.println("    static {");
  -                    }
                       TypeEntry te = (TypeEntry) attributes.get(i);
                       QName attrName = (QName) attributes.get(i + 1);
                       String attrLocalName = attrName.getLocalPart();
  @@ -266,11 +262,6 @@
                   boolean wroteElemDecl = false;
                   
                   for (int i=0; i<elementMetaData.size(); i++) {
  -                    if(((i+1)%10) == 0) {
  -                        pw.println("    }");
  -                        pw.println("    static {");
  -                        wroteElemDecl = false;
  -                    }
                       ElementDecl elem = (ElementDecl) elementMetaData.elementAt(i);
   
                       if (elem.getAnyElement()) {
  
  
  
  1.117     +14 -5     
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
  retrieving revision 1.116
  retrieving revision 1.117
  diff -u -r1.116 -r1.117
  --- JavaStubWriter.java       10 Jul 2003 16:43:24 -0000      1.116
  +++ JavaStubWriter.java       10 Jul 2003 23:10:53 -0000      1.117
  @@ -117,6 +117,8 @@
           uses.put(Use.LITERAL, "org.apache.axis.enum.Use.LITERAL");
       }
   
  +    static int OPERDESC_PER_BLOCK = 10;
  +
       /**
        * Constructor.
        */
  @@ -363,11 +365,18 @@
           pw.println("    static {");
           pw.println("        _operations = new 
org.apache.axis.description.OperationDesc[" +
                   operations.size() + "];");
  -        pw.println("        org.apache.axis.description.OperationDesc oper;");
  -        for (int i = 0; i < operations.size(); ++i) {
  -            if(((i+1)%10) == 0) {
  -                pw.println("    }");
  -                pw.println("    static {");
  +
  +        for (int j = 0, k = 0; j < operations.size(); ++j) {
  +            if((j%OPERDESC_PER_BLOCK) == 0) {
  +                k++;
  +                pw.println("        _initOperationDesc" + k + "();");
  +            }
  +        }
  +        for (int i = 0, k = 0; i < operations.size(); ++i) {
  +            if((i%OPERDESC_PER_BLOCK) == 0) {
  +                k++;
  +                pw.println("    }\n");
  +                pw.println("    private static void _initOperationDesc" + k + 
"(){");
                   pw.println("        org.apache.axis.description.OperationDesc 
oper;");
               }
               BindingOperation operation = (BindingOperation) operations.get(i);