jochen 2005/07/05 00:45:55
Modified: src/xs/org/apache/ws/jaxme/xs/junit Tag: v0_4
ParserTest.java
src/test/jaxb Tag: v0_4 types.xsd
src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg Tag:
v0_4 GroupBeanSG.java
Log:
Fixed a bug in the check for inherited elements.
Revision Changes Path
No revision
No revision
1.20.2.5 +26 -0
ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java
Index: ParserTest.java
===================================================================
RCS file:
/home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/junit/ParserTest.java,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -u -r1.20.2.4 -r1.20.2.5
--- ParserTest.java 20 May 2005 06:58:59 -0000 1.20.2.4
+++ ParserTest.java 5 Jul 2005 07:45:55 -0000 1.20.2.5
@@ -886,6 +886,18 @@
" </xs:extension>\n" +
" </xs:complexContent>\n" +
" </xs:complexType>\n" +
+ " <xs:element name='c'>\n" +
+ " <xs:complexType>\n" +
+ " <xs:complexContent>\n" +
+ " <xs:extension base='a'>\n" +
+ " <xs:sequence>\n" +
+ " <xs:element name='ce1' type='xs:string'
maxOccurs='unbounded'/>\n" +
+ " </xs:sequence>\n" +
+ " <xs:attribute name='ca1' type='xs:long'/>\n" +
+ " </xs:extension>\n" +
+ " </xs:complexContent>\n" +
+ " </xs:complexType>\n" +
+ " </xs:element>\n" +
"</xs:schema>\n";
InputSource isource = new InputSource(new StringReader(schemaSource));
@@ -913,6 +925,20 @@
assertEquals(aa1, bAttributes[0]);
XSAttribute ba1 = (XSAttribute) bAttributes[1];
assertEquals(new XsQName((String) null, "ba1"), ba1.getName());
+
+ XSElement[] elements = schema.getElements();
+ assertEquals(1, elements.length);
+ XSElement c = elements[0];
+ assertEquals(new XsQName((String) null, "c"), c.getName());
+ XSType cType = c.getType();
+ XSComplexType cComplexType = assertComplexType(cType);
+ assertTrue(cComplexType.isExtension());
+ assertEquals(cComplexType.getExtendedType(), a);
+ XSAttributable[] cAttributes = cComplexType.getAttributes();
+ assertEquals(2, cAttributes.length);
+ assertEquals(aa1, cAttributes[0]);
+ XSAttribute ca1 = (XSAttribute) cAttributes[1];
+ assertEquals(new XsQName((String) null, "ca1"), ca1.getName());
}
/** Tests setting attributes, which aren't specified in the
No revision
No revision
1.10.2.3 +3 -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.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- types.xsd 4 Jul 2005 23:59:19 -0000 1.10.2.2
+++ types.xsd 5 Jul 2005 07:45:55 -0000 1.10.2.3
@@ -250,6 +250,9 @@
<xs:complexType>
<xs:complexContent>
<xs:extension base="ex:FsNode">
+ <xs:sequence>
+ <xs:element name="description" type="xs:string"/>
+ </xs:sequence>
<xs:attribute name="hidden" type="xs:boolean" use="optional"
default="false"/>
</xs:extension>
</xs:complexContent>
No revision
No revision
1.1.2.2 +3 -3
ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg/Attic/GroupBeanSG.java
Index: GroupBeanSG.java
===================================================================
RCS file:
/home/cvs/ws-jaxme/src/jaxme/org/apache/ws/jaxme/generator/sg/impl/ccsg/Attic/GroupBeanSG.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- GroupBeanSG.java 4 Jul 2005 23:59:19 -0000 1.1.2.1
+++ GroupBeanSG.java 5 Jul 2005 07:45:55 -0000 1.1.2.2
@@ -40,7 +40,7 @@
if (pInheritedParticles != null) {
String p = pParticle.getPropertySG().getPropertyName();
for (int i = 0; i < pInheritedParticles.length; i++) {
- if
(pParticle.getPropertySG().getPropertyName().equals(p)) {
+ if
(pInheritedParticles[i].getPropertySG().getPropertyName().equals(p)) {
return true;
}
}
@@ -57,8 +57,8 @@
TypeSG extTSG = ctSG.getTypeSG().getExtendedType();
if (extTSG.isComplex() &&
!extTSG.getComplexTypeSG().hasSimpleContent()) {
inheritedParticles =
extTSG.getComplexTypeSG().getComplexContentSG().getElementParticles();
- }
- }
+ }
+ }
for (int i = 0; i < elementParticles.length; i++) {
ParticleSG particle = elementParticles[i];
if (!isInheritedParticle(particle, inheritedParticles))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
