You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2005/07/05 10:03:43 UTC

cvs commit: ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl EnumerationSG.java

jochen      2005/07/05 01:03:43

  Modified:    src/test/jaxb Tag: v0_4 enumeration.xsd
               .        Tag: v0_4 status.xml
               src/jaxme/org/apache/ws/jaxme/generator/sg/impl Tag: v0_4
                        EnumerationSG.java
  Log:
  Fixed, that driver and handler classes could not be compiled, if enumerations had default values.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.3.2.1   +1 -1      ws-jaxme/src/test/jaxb/enumeration.xsd
  
  Index: enumeration.xsd
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/test/jaxb/enumeration.xsd,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- enumeration.xsd	29 Sep 2004 08:41:02 -0000	1.3
  +++ enumeration.xsd	5 Jul 2005 08:03:42 -0000	1.3.2.1
  @@ -235,7 +235,7 @@
   
     <xs:element name="LocalEnumAttribute">
       <xs:complexType>
  -      <xs:attribute name="stringAttr">
  +      <xs:attribute name="stringAttr" default="b">
           <xs:simpleType>
             <xs:restriction base="xs:string">
               <xs:enumeration value="a"/>
  
  
  
  No                   revision
  No                   revision
  1.45.2.11 +4 -0      ws-jaxme/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/status.xml,v
  retrieving revision 1.45.2.10
  retrieving revision 1.45.2.11
  diff -u -r1.45.2.10 -r1.45.2.11
  --- status.xml	5 Jul 2005 00:01:08 -0000	1.45.2.10
  +++ status.xml	5 Jul 2005 08:03:42 -0000	1.45.2.11
  @@ -35,6 +35,10 @@
           Use of xs:extension is now mapped to proper Java
           inheritance (at least for the bean classes).
         </action>
  +      <action dev="JW" type="fix" context="generator">
  +        Fixed that the handler and driver classes could not
  +        be compiled, if enumerations had default values.
  +      </action>
       </release>
       <release version="0.4" date="2005-May-19">
         <action dev="JW" type="fix" context="xs">
  
  
  
  No                   revision
  No                   revision
  1.4.2.2   +1 -1      ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/EnumerationSG.java
  
  Index: EnumerationSG.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/EnumerationSG.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- EnumerationSG.java	28 Apr 2005 23:57:40 -0000	1.4.2.1
  +++ EnumerationSG.java	5 Jul 2005 08:03:42 -0000	1.4.2.2
  @@ -147,7 +147,7 @@
     public TypedValue getCastFromString(SimpleTypeSG pController, String pValue) throws SAXException {
       for (int i = 0;  i < values.length;  i++) {
         if (values[i].getValue().equals(pValue)) {
  -        return new TypedValueImpl(values[i].getName(), qName);
  +        return new TypedValueImpl(new Object[]{qName, ".", values[i].getName()}, qName);
         }
       }
       return super.getCastFromString(pController, pValue);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org