axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/wsdl/toJava JavaBeanWriter.java
Date Mon, 03 Mar 2003 15:43:05 GMT
dims        2003/03/03 07:43:05

  Modified:    java/src/org/apache/axis/wsdl/toJava JavaBeanWriter.java
  Log:
  Fix for Bug 16894 - wsdl2java generated "equals(...)" method should use "this."
  
  Revision  Changes    Path
  1.37      +7 -7      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
  
  Index: JavaBeanWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaBeanWriter.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- JavaBeanWriter.java	28 Feb 2003 15:32:34 -0000	1.36
  +++ JavaBeanWriter.java	3 Mar 2003 15:43:05 -0000	1.37
  @@ -609,24 +609,24 @@
                           variableType.equals("double") ||
                           variableType.equals("boolean") ||
                           variableType.equals("byte")) {
  -                    pw.print("            " + variable + " == other." + get +
  +                    pw.print("            this." + variable + " == other." + get +
                               Utils.capitalizeFirstChar(variable) + "()");
                   } else if (variableType.indexOf("[") >=0) {
                       // Use java.util.Arrays.equals to compare arrays.
  -                    pw.println("            ((" + variable +
  +                    pw.println("            ((this." + variable +
                                  "==null && other." + get +
                                  Utils.capitalizeFirstChar(variable) + "()==null) || ");
  -                    pw.println("             (" + variable + "!=null &&");
  -                    pw.print("              java.util.Arrays.equals(" + variable +
  +                    pw.println("             (this." + variable + "!=null &&");
  +                    pw.print("              java.util.Arrays.equals(this." + variable +
                                ", other." + get +
                                Utils.capitalizeFirstChar(variable) + "())))");
   
                   } else {
  -                    pw.println("            ((" + variable +
  +                    pw.println("            ((this." + variable +
                                  "==null && other." + get +
                                  Utils.capitalizeFirstChar(variable) + "()==null) || ");
  -                    pw.println("             (" + variable + "!=null &&");
  -                    pw.print("              " + variable +
  +                    pw.println("             (this." + variable + "!=null &&");
  +                    pw.print("              this." + variable +
                                ".equals(other." + get +
                                Utils.capitalizeFirstChar(variable) + "())))");
                   }
  
  
  

Mime
View raw message