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

[gdaniels]

gdaniels    02/03/10 21:04:59

  Modified:    java/src/org/apache/axis/wsdl/toJava
                        JavaComplexTypeWriter.java
  Log:
  Few tweaks to get attribute names that don't match the java field
  descriptor names working properly.
  
  Revision  Changes    Path
  1.17      +8 -1      
xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaComplexTypeWriter.java
  
  Index: JavaComplexTypeWriter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaComplexTypeWriter.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JavaComplexTypeWriter.java        9 Mar 2002 19:29:49 -0000       1.16
  +++ JavaComplexTypeWriter.java        11 Mar 2002 05:04:59 -0000      1.17
  @@ -256,8 +256,10 @@
   
               if (attributes != null) {
                   for (int i = 0; i < attributes.size(); i += 2) {
  +                    String attrName = (String) attributes.get(i + 1);
                       String fieldName =
  -                            Utils.xmlNameToJava((String) attributes.get(i + 1));
  +                            Utils.capitalizeFirstChar(
  +                                    Utils.xmlNameToJava(attrName));
                       pw.print("        ");
                       if (!wroteFieldType) {
                           pw.print("org.apache.axis.description.FieldDesc ");
  @@ -265,6 +267,11 @@
                       }
                       pw.println("field = new 
org.apache.axis.description.AttributeDesc();");
                       pw.println("        field.setFieldName(\"" + fieldName + 
"\");");
  +                    if (!fieldName.equals(attrName)) {
  +                        pw.print("        field.setXmlName(");
  +                        pw.print("new javax.xml.rpc.namespace.QName(null, \"");
  +                        pw.println(attrName + "\"));");
  +                    }
                       pw.println("        typeDesc.addFieldDesc(field);");
                   }
               }