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 2004/10/12 01:04:00 UTC

cvs commit: ws-jaxme status.xml

jochen      2004/10/11 16:04:00

  Modified:    src/test/jaxb Tag: Branch_R0_3 types.xsd
               src/jaxme/org/apache/ws/jaxme/generator/sg/impl Tag:
                        Branch_R0_3 JAXBGroupSG.java
               .        Tag: Branch_R0_3 status.xml
  Log:
  Fixed bug in the unmarshalling of elements with simple content.
  PR: JAXME-38
  Submitted by: Fredrik Vraalsen, fredrik at vraalsen.no
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.4   +16 -0     ws-jaxme/src/test/jaxb/types.xsd
  
  Index: types.xsd
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/test/jaxb/types.xsd,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- types.xsd	27 Jul 2004 08:40:59 -0000	1.4.2.3
  +++ types.xsd	11 Oct 2004 23:04:00 -0000	1.4.2.4
  @@ -185,4 +185,20 @@
         </xs:all>
       </xs:complexType>
     </xs:element>
  +
  +	<xs:element name="row">
  +		<xs:complexType>
  +			<xs:sequence>
  +				<xs:element name="cell" maxOccurs="unbounded">
  +					<xs:complexType>
  +						<xs:simpleContent>
  +							<xs:extension base="xs:string">
  +								<xs:attribute name="id" type="xs:string" use="required"/>
  +							</xs:extension>
  +						</xs:simpleContent>
  +					</xs:complexType>
  +				</xs:element>
  +			</xs:sequence>
  +		</xs:complexType>
  +	</xs:element>
   </xs:schema>
  
  
  
  No                   revision
  No                   revision
  1.10.2.4  +6 -7      ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBGroupSG.java
  
  Index: JAXBGroupSG.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/JAXBGroupSG.java,v
  retrieving revision 1.10.2.3
  retrieving revision 1.10.2.4
  diff -u -r1.10.2.3 -r1.10.2.4
  --- JAXBGroupSG.java	27 Aug 2004 20:48:01 -0000	1.10.2.3
  +++ JAXBGroupSG.java	11 Oct 2004 23:04:00 -0000	1.10.2.4
  @@ -688,18 +688,17 @@
       DirectAccessible pQName = jm.addParam(String.class, "pQName");
       jm.addThrows(SAXException.class);
   
  +    jm.addIf(pLevelVar, " == 1");
  +    jm.addLine("return;");
  +    jm.addEndIf();
  +
       jm.addIf(pHandlerVar, " == null");
  -    jm.addIf(pLevelVar, " > 1");
       jm.addLine("super.endElement(", pNamespaceURI, ", ", pLocalName, ", ", pQName, ");");
  -    jm.addEndIf();
       jm.addElse();
       jm.addLine(pHandlerVar, ".endElement(", pNamespaceURI, ", ", pLocalName, ", ", pQName, ");");
       jm.addEndIf();
   
  -    jm.addSwitch("--", pLevelVar);
  -    jm.addCase("0");
  -    jm.addBreak();
  -    jm.addCase("1");
  +    jm.addIf("--", pLevelVar, " == 1");
       JavaQName elementInterface = pController.getClassContext().getXMLInterfaceName();
       LocalJavaField element = jm.newJavaField(elementInterface);
       element.addLine("(", elementInterface, ") getResult()");
  @@ -737,7 +736,7 @@
       jm.addDefault();
       jm.addThrowNew(IllegalStateException.class, JavaSource.getQuoted("Illegal state: "), " + ",  pStateVar);
       jm.addEndSwitch();
  -    jm.addEndSwitch();
  +    jm.addEndIf();
   
       return jm;
     }
  
  
  
  No                   revision
  No                   revision
  1.15.2.20 +5 -0      ws-jaxme/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/status.xml,v
  retrieving revision 1.15.2.19
  retrieving revision 1.15.2.20
  diff -u -r1.15.2.19 -r1.15.2.20
  --- status.xml	29 Sep 2004 08:41:11 -0000	1.15.2.19
  +++ status.xml	11 Oct 2004 23:04:00 -0000	1.15.2.20
  @@ -30,6 +30,11 @@
   
     <changes>
       <release version="0.3.2" date="unreleased">
  +      <action dev="JW" type="fix" context="generator">
  +        Fixed bug in the unmarshalling of elements with simple
  +        content. (Fredrik Vraalsen, fredrik at vraalsen.no)
  +        See JAXME-38 in Jira.
  +      </action>
   	  <action dev="JW" type="fix" context="generator">
   	    Fixed the handling of the Ant tasks "extension" attribute
   	    and the handling of "xjc:serializable". Ensured that
  
  
  

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