Improve support for group references (see c94de71 and #299)

Michael Ganss · Michael Ganss · commit 585d6f343537 · 2022-01-20T17:43:47.000+01:00
diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -184,10 +184,7 @@ private void RenameInterfacePropertiesIfRenamedInDerivedClasses()
                         {
                             if (implementationClassProperty.Name != implementationClassProperty.OriginalPropertyName
                                 && implementationClassProperty.OriginalPropertyName == interfaceProperty.Name
-                                && implementationClassProperty.XmlSchemaName == interfaceProperty.XmlSchemaName
-                                && implementationClassProperty.XmlParent?.Parent is XmlSchemaGroup implementationGroup
-                                && interfaceProperty.XmlParent?.Parent is XmlSchemaGroup interfaceGroup
-                                && implementationGroup.QualifiedName == interfaceGroup.QualifiedName)
+                                && implementationClassProperty.XmlSchemaName == interfaceProperty.XmlSchemaName)
                             {
                                 RenameInterfacePropertyInBaseClasses(interfaceModel, implementationClass, interfaceProperty, implementationClassProperty.Name);
                                 interfaceProperty.Name = implementationClassProperty.Name;
@@ -944,7 +941,7 @@ private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeM
                                 CreateTypeModel(group, groupRef.RefName);
                             }
 
-                            var groupItems = GetElements(group.Particle).Where(p => !processedItems.Any(q => p.XmlParticle == q.XmlParticle)).ToList();
+                            var groupItems = GetElements(groupRef.Particle).Where(p => !processedItems.Any(q => p.XmlParticle == q.XmlParticle)).ToList();
                             var groupProperties = CreatePropertiesForElements(source, typeModel, item, groupItems, order: order, processedItems: processedItems).ToList();
                             if (_configuration.EmitOrder)
                             {

Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,7 @@ private void RenameInterfacePropertiesIfRenamedInDerivedClasses()`
`184`	`184`	`{`
`185`	`185`	`if (implementationClassProperty.Name != implementationClassProperty.OriginalPropertyName`
`186`	`186`	`&& implementationClassProperty.OriginalPropertyName == interfaceProperty.Name`
`187`		`- && implementationClassProperty.XmlSchemaName == interfaceProperty.XmlSchemaName`
`188`		`- && implementationClassProperty.XmlParent?.Parent is XmlSchemaGroup implementationGroup`
`189`		`- && interfaceProperty.XmlParent?.Parent is XmlSchemaGroup interfaceGroup`
`190`		`- && implementationGroup.QualifiedName == interfaceGroup.QualifiedName)`
	`187`	`+ && implementationClassProperty.XmlSchemaName == interfaceProperty.XmlSchemaName)`
`191`	`188`	`{`
`192`	`189`	`RenameInterfacePropertyInBaseClasses(interfaceModel, implementationClass, interfaceProperty, implementationClassProperty.Name);`
`193`	`190`	`interfaceProperty.Name = implementationClassProperty.Name;`
`@@ -944,7 +941,7 @@ private IEnumerable<PropertyModel> CreatePropertiesForElements(Uri source, TypeM`
`944`	`941`	`CreateTypeModel(group, groupRef.RefName);`
`945`	`942`	`}`
`946`	`943`
`947`		`- var groupItems = GetElements(group.Particle).Where(p => !processedItems.Any(q => p.XmlParticle == q.XmlParticle)).ToList();`
	`944`	`+ var groupItems = GetElements(groupRef.Particle).Where(p => !processedItems.Any(q => p.XmlParticle == q.XmlParticle)).ToList();`
`948`	`945`	`var groupProperties = CreatePropertiesForElements(source, typeModel, item, groupItems, order: order, processedItems: processedItems).ToList();`
`949`	`946`	`if (_configuration.EmitOrder)`
`950`	`947`	`{`