You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2005/01/20 15:59:39 UTC

cvs commit: ws-axis/java/src/org/apache/axis/wsdl Java2WSDL.java

dims        2005/01/20 06:59:39

  Modified:    java/src/org/apache/axis/wsdl Java2WSDL.java
  Log:
  Ensure Typemapping is set.
  
  Revision  Changes    Path
  1.48      +7 -8      ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java
  
  Index: Java2WSDL.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/Java2WSDL.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Java2WSDL.java	20 Jan 2005 14:18:05 -0000	1.47
  +++ Java2WSDL.java	20 Jan 2005 14:59:39 -0000	1.48
  @@ -245,6 +245,9 @@
       /** Field locationSet */
       boolean locationSet = false;
   
  +    /** Field typeMappingVersion */
  +    protected String typeMappingVersion = "1.2";
  +    
       /**
        * Instantiate a Java2WSDL emitter.
        */
  @@ -407,13 +410,7 @@
   
               case TYPEMAPPING_OPT:
                   value = option.getArgument();
  -
  -                try {
  -                    emitter.setTypeMappingVersion(value);
  -                } catch (Exception e) {
  -                    System.out.println(Messages.getMessage("j2wBadTypeMapping00"));
  -                    status = false;
  -                }
  +                typeMappingVersion = value;
                   break;
   
               case SOAPACTION_OPT:
  @@ -513,7 +510,6 @@
   
               return false;
           }
  -
           return true;    // a-OK
       }
   
  @@ -560,6 +556,9 @@
               if (!namespaceMap.isEmpty()) {
                   emitter.setNamespaceMap(namespaceMap);
               }
  +
  +            // Set the TypeMappingVersion
  +            emitter.setTypeMappingVersion(typeMappingVersion);
   
               // Find the class using the name
               emitter.setCls(className);