From 507ecdb930caf77af7f9a61a35687fcb6fb3b36b Mon Sep 17 00:00:00 2001 From: Markus Quaritsch <markus.quaritsch@tugraz.at> Date: Wed, 7 Jun 2017 10:40:14 +0200 Subject: [PATCH] remove unnecessary xsd extensions --- .../Resources/XSD/VectoComponent.xsd | 56 +++---------------- .../XSD/VectoDeclarationDefinitions.1.0.xsd | 56 +++---------------- 2 files changed, 14 insertions(+), 98 deletions(-) diff --git a/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd b/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd index 6232b8f945..b620690470 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoComponent.xsd @@ -8,57 +8,15 @@ </xs:annotation> <xs:complexType> <xs:choice> - <xs:element name="Engine"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:EngineComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Gearbox"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:GearboxComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="Engine" type="vdecdef:EngineComponentDeclarationType"/> + <xs:element name="Gearbox" type="vdecdef:GearboxComponentDeclarationType"/> <xs:element name="TorqueConverter" type="vdecdef:TorqueConverterComponentDeclarationType"/> - <xs:element name="Retarder"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:RetarderComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Axlegear"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:AxlegearComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Tyre"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:TyreDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="Retarder" type="vdecdef:RetarderComponentDeclarationType"/> + <xs:element name="Axlegear" type="vdecdef:AxlegearComponentDeclarationType"/> + <xs:element name="Tyre" type="vdecdef:TyreDeclarationType"/> <xs:element name="Auxiliaries" type="vdecdef:AuxiliariesComponentDeclarationType"/> - <xs:element name="Angledrive"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:AngledriveComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="AirDrag"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="vdecdef:AirDragComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="Angledrive" type="vdecdef:AngledriveComponentDeclarationType"/> + <xs:element name="AirDrag" type="vdecdef:AirDragComponentDeclarationType"/> </xs:choice> <xs:attribute name="schemaVersion" use="required"> <xs:simpleType> diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd index bd780cc6cc..988c2d97e6 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.1.0.xsd @@ -217,13 +217,7 @@ <xs:documentation>P195 - bool</xs:documentation> </xs:annotation> </xs:element> - <xs:element name="Tyre"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:TyreDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="Tyre" type="tns:TyreDeclarationType"/> </xs:sequence> <xs:attribute name="axleNumber" use="required"> <xs:simpleType> @@ -977,50 +971,14 @@ <xs:element name="Components"> <xs:complexType> <xs:sequence> - <xs:element name="Engine"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:EngineComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Gearbox"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:GearboxComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Angledrive" minOccurs="0"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:AngledriveComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Retarder" minOccurs="0"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:RetarderComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> - <xs:element name="Axlegear"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:AxlegearComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="Engine" type="tns:EngineComponentDeclarationType"/> + <xs:element name="Gearbox" type="tns:GearboxComponentDeclarationType"/> + <xs:element name="Angledrive" type="tns:AngledriveComponentDeclarationType" minOccurs="0"/> + <xs:element name="Retarder" type="tns:RetarderComponentDeclarationType" minOccurs="0"/> + <xs:element name="Axlegear" type="tns:AxlegearComponentDeclarationType"/> <xs:element name="AxleWheels" type="tns:AxleWheelsComponentDeclarationType"/> <xs:element name="Auxiliaries" type="tns:AuxiliariesComponentDeclarationType"/> - <xs:element name="AirDrag" minOccurs="0"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="tns:AirDragComponentDeclarationType"/> - </xs:complexContent> - </xs:complexType> - </xs:element> + <xs:element name="AirDrag" type="tns:AirDragComponentDeclarationType" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> -- GitLab