axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bu...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava Parameters.java JavaWriterFactory.java
Date Mon, 14 Jan 2002 21:21:11 GMT
butek       02/01/14 13:21:11

  Modified:    java/src/org/apache/axis/wsdl/toJava Parameters.java
                        JavaWriterFactory.java
  Log:
  Now that the skeleton has the same signature as the portType interface, the stub,
  and the impl, we no longer need the skeletonSignature generation code.
  
  Revision  Changes    Path
  1.3       +0 -4      xml-axis/java/src/org/apache/axis/wsdl/toJava/Parameters.java
  
  Index: Parameters.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/Parameters.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Parameters.java	13 Dec 2001 17:33:17 -0000	1.2
  +++ Parameters.java	14 Jan 2002 21:21:11 -0000	1.3
  @@ -77,9 +77,6 @@
       // The signature that the interface and the stub will use
       public String signature = null;
   
  -    // The signature that the skeleton will use
  -    public String skelSignature = null;
  -
       // The numbers of the respective parameters
       public int inputs = 0;
       public int inouts = 0;
  @@ -90,7 +87,6 @@
                   + "\nreturnTypeName = " + returnName
                   + "\nfaultString = " + faultString
                   + "\nsignature = " + signature
  -                + "\nskelSignature = " + skelSignature
                   + "\n(inputs, inouts, outputs) = (" + inputs + ", " + inouts + ", " + outputs
+ ")"
                   + "\nlist = " + list;
       } // toString
  
  
  
  1.6       +5 -36     xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriterFactory.java
  
  Index: JavaWriterFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriterFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JavaWriterFactory.java	10 Jan 2002 19:12:08 -0000	1.5
  +++ JavaWriterFactory.java	14 Jan 2002 21:21:11 -0000	1.6
  @@ -371,7 +371,7 @@
                       while(operations.hasNext()) {
                           Operation operation = (Operation) operations.next();
                           String name = operation.getName();
  -                        constructSignatures(ptEntry.getParameters(name), name);
  +                        constructSignature(ptEntry.getParameters(name), name);
                       }
                   }
               }
  @@ -379,23 +379,14 @@
       } // constructSignatures
   
       /**
  -     * Construct the signatures.  signature is used by both the interface and the stub.
  -     * skelSig is used by the skeleton.
  +     * Construct the signature, which is used by both the interface and the stub.
        */
  -    private void constructSignatures(Parameters parms, String opName) {
  +    private void constructSignature(Parameters parms, String opName) {
           String name  = Utils.xmlNameToJava(opName);
  -        int allOuts = parms.outputs + parms.inouts;
           String ret = parms.returnType == null ? "void" : parms.returnType.getName();
           String signature = "    public " + ret + " " + name + "(";
  -        String skelSig = null;
  -
  -        if (allOuts == 0)
  -            skelSig = "    public void " + name + "(";
  -        else
  -            skelSig = "    public Object " + name + "(";
   
           boolean needComma = false;
  -        boolean needSkelSigComma = false;
   
           for (int i = 0; i < parms.list.size(); ++i) {
               Parameter p = (Parameter) parms.list.get(i);
  @@ -410,40 +401,18 @@
               String javifiedName = Utils.xmlNameToJava(p.name);
               if (p.mode == Parameter.IN) {
                   signature = signature + p.type.getName() + " " + javifiedName;
  -                if (needSkelSigComma) {
  -                    skelSig = skelSig + ", ";
  -                }
  -                else {
  -                    needSkelSigComma = true;
  -                }
  -                skelSig = skelSig + p.type.getName() + " " + javifiedName;
  -            }
  -            else if (p.mode == Parameter.INOUT) {
  -                signature = signature + Utils.holder(p.type, symbolTable) + " "
  -                        + javifiedName;
  -                if (needSkelSigComma) {
  -                    skelSig = skelSig + ", ";
  -                }
  -                else {
  -                    needSkelSigComma = true;
  -                }
  -                skelSig = skelSig + p.type.getName() + " " + javifiedName;
               }
  -            else// (p.mode == Parameter.OUT)
  -            {
  +            else {
                   signature = signature + Utils.holder(p.type, symbolTable) + " "
                           + javifiedName;
               }
           }
           signature = signature + ") throws java.rmi.RemoteException";
  -        skelSig = skelSig + ") throws java.rmi.RemoteException";
           if (parms.faultString != null) {
               signature = signature + ", " + parms.faultString;
  -            skelSig = skelSig + ", " + parms.faultString;
           }
           parms.signature = signature;
  -        parms.skelSignature = skelSig;
  -    } // constructSignatures
  +    } // constructSignature
   
       /**
        * Find all inout/out parameters and add a flag to the Type of that parameter saying
a holder
  
  
  

Mime
View raw message