From 0c7c102512b02917334104cee1f78082aee7893c Mon Sep 17 00:00:00 2001 From: "harald.martini@student.tugraz.at" <harald.martini@student.tugraz.at> Date: Mon, 4 Oct 2021 11:45:42 +0200 Subject: [PATCH] Change BusManufacturingStageDataType to BusManufacturingStepDataType --- .../completed_heavyBus_31b.VIF_Report_2.xml | 2 +- .../completed_heavyBus_34f.VIF_Report_2.xml | 2 +- .../completed_heavyBus_39a.VIF_Report_2.xml | 2 +- ...to_multistage_conventional_final_vif.VIF_Report_1.xml | 2 +- VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs | 9 +++++++++ VectoCommon/VectoCommon/Resources/XMLNames.resx | 3 +++ .../VehicleInformationFile/XMLMultistageBusReport.cs | 2 +- .../Resources/XSD/VectoOutputMultistage.0.1.xsd | 2 +- .../FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml | 2 +- .../SchemaVersion1.0/test.VIF_Report_2.xml | 2 +- .../exempted_completed.VIF_Report_2.xml | 2 +- .../vecto_multistage_consolidated_multiple_stages.xml | 6 +++--- ...tistage_consolidated_multiple_stages_NGTankSystem.xml | 6 +++--- ...o_multistage_consolidated_multiple_stages_airdrag.xml | 6 +++--- ..._multistage_consolidated_multiple_stages_heatPump.xml | 6 +++--- ...vecto_multistage_consolidated_multiple_stages_hev.xml | 6 +++--- ...vecto_multistage_consolidated_multiple_stages_vif.xml | 4 ++-- .../vecto_multistage_consolidated_one_stage.xml | 2 +- .../vecto_multistage_consolidated_two_stages.xml | 4 ++-- ...to_multistage_conventional_final_vif.VIF_Report_1.xml | 2 +- .../vecto_multistage_primary_vehicle_stage_2_3.xml | 4 ++-- ...ecto_multistage_primary_vehicle_stage_2_3_group41.xml | 4 ++-- .../vecto_multistage_primary_vehicle_stage_2_full.xml | 2 +- ...ecto_multistage_primary_vehicle_stage_2_mandatory.xml | 2 +- 24 files changed, 48 insertions(+), 36 deletions(-) diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml index 817ea41674..7181a7636b 100644 --- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml +++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml @@ -572,7 +572,7 @@ </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-aec22451f48f47c484ac"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-aec22451f48f47c484ac"> <HashPreviousStage> <di:Reference URI="#VEH-88dcf76d37a64b5eaf70"> <di:Transforms> diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml index 93af085699..6df32a71f3 100644 --- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml +++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml @@ -603,7 +603,7 @@ </vif0.1:Signature> </vif0.1:PrimaryVehicle> <vif0.1:ManufacturingStep stepCount="2"> - <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-607e449d2b0e45228b69"> + <vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-607e449d2b0e45228b69"> <vif0.1:HashPreviousStage> <di:Reference URI="#PIF-7f30aafa027a41a1864b"> <di:Transforms> diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml index 0eb4cdbc75..5b0e9b949a 100644 --- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml +++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml @@ -577,7 +577,7 @@ </vif0.1:Signature> </vif0.1:PrimaryVehicle> <vif0.1:ManufacturingStep stepCount="2"> - <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-9d0c3a409fce4a89a6ce"> + <vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-9d0c3a409fce4a89a6ce"> <vif0.1:HashPreviousStage> <di:Reference URI="#PIF-10652bf49ae0499f8689"> <di:Transforms> diff --git a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml index 89f11bf27e..ed80fbec00 100644 --- a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml +++ b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml @@ -575,7 +575,7 @@ </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> <HashPreviousStage> <di:Reference URI="#VEH-622a60d3b3cf4340a362"> <di:Transforms> diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs index fb5f279780..84724eb7cd 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs +++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs @@ -1302,6 +1302,15 @@ namespace TUGraz.VectoCommon.Resources { } } + /// <summary> + /// Looks up a localized string similar to BusManufacturingStepDataType. + /// </summary> + public static string BusManufacturingStepDataType { + get { + return ResourceManager.GetString("BusManufacturingStepDataType", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to ChassisConfiguration. /// </summary> diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx index 787de9a3f0..507697b9da 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.resx +++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx @@ -1587,4 +1587,7 @@ <data name="VehicleTypeApprovalNumber" xml:space="preserve"> <value>VehicleTypeApprovalNumber</value> </data> + <data name="BusManufacturingStepDataType" xml:space="preserve"> + <value>BusManufacturingStepDataType</value> + </data> </root> \ No newline at end of file diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs index b95fe27086..fd24ed6925 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs @@ -212,7 +212,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF var stage = new XElement(tns + XMLNames.ManufacturingStep, new XAttribute(XMLNames.ManufacturingStep_StepCount, GetStageNumber()), new XElement(tns + XMLNames.Report_DataWrap, - new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStageDataType"), + new XAttribute(xsi + XMLNames.Attr_Type, XMLNames.BusManufacturingStepDataType), new XAttribute(XMLNames.Component_ID_Attr, multistageId), new XAttribute("xmlns", tns), GetHashPreviousStageElement(), diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd index 00f5051698..f4b30701ae 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd @@ -366,7 +366,7 @@ </xs:extension> </xs:complexContent> </xs:complexType> - <xs:complexType name="BusManufacturingStageDataType"> + <xs:complexType name="BusManufacturingStepDataType"> <xs:complexContent> <xs:extension base="vif:AbstractManufacturingStepDataType"> <xs:sequence> diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml index 270185d989..e5b5465e55 100644 --- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml +++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml @@ -579,7 +579,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf"> + <Data xsi:type="vif0.1:BusManufacturingStepDataType" id="asdf"> <HashPreviousStage> <di:Reference> <di:DigestMethod Algorithm=""></di:DigestMethod> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml index 1d412027c8..ca35b00e49 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml @@ -563,7 +563,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </vif0.1:Signature> </vif0.1:PrimaryVehicle> <vif0.1:ManufacturingStep stepCount="2"> - <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-ab066054c1bc431db1e3"> + <vif0.1:Data xsi:type="BusManufacturingStepDataType" id="MST-ab066054c1bc431db1e3"> <vif0.1:HashPreviousStage> <di:Reference URI="#PIF-4121ae4751874cefa376"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml index 7f7b036d7d..976884de24 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml @@ -58,7 +58,7 @@ </Signature> </PrimaryVehicle> <vif0.1:ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> <HashPreviousStage> <di:Reference URI="#VEH-4cb168560c0d4b3d886d"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml index 32090a802c..1faacae693 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -688,7 +688,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> @@ -759,7 +759,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="4"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-3"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-3"> <HashPreviousStage> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml index 858325f396..55d268b258 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml @@ -641,7 +641,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -691,7 +691,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> @@ -762,7 +762,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="4"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-3"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-3"> <HashPreviousStage> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml index 49987d56aa..cf23f71e7b 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -732,7 +732,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> @@ -804,7 +804,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="4"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-3"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-3"> <HashPreviousStage> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml index 1aaf43fa0e..d798a2564d 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -688,7 +688,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> @@ -759,7 +759,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="4"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-3"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-3"> <HashPreviousStage> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml index 5ea6673015..9a8b6efb9b 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -688,7 +688,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> @@ -759,7 +759,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="4"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-3"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-3"> <HashPreviousStage> <di:Reference URI="#RESULT-8f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml index 65391e324b..33809f1006 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -686,7 +686,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml index 631dfe2dd5..81e09f72fa 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml index c046b728cd..639d18fe1c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -686,7 +686,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml index ce036210b2..72114aaada 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml @@ -575,7 +575,7 @@ </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> + <Data xsi:type="BusManufacturingStepDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"> <HashPreviousStage> <di:Reference URI="#VEH-622a60d3b3cf4340a362"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml index c0042c347e..3553a2795b 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -675,7 +675,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml index 699f62be97..43f42aedf7 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml @@ -573,7 +573,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> @@ -608,7 +608,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </ManufacturingStep> <ManufacturingStep stepCount="3"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-2"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-2"> <HashPreviousStage> <di:Reference URI="#RESULT-6f30c7fe665a47938f6b"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml index ca42bbe39a..9d93e30553 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d11aff76c5d149948046"> <di:Transforms> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml index 0827a21d15..339950c3d2 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml @@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile </Signature> </PrimaryVehicle> <ManufacturingStep stepCount="2"> - <Data xsi:type="BusManufacturingStageDataType" id="MSTG-1"> + <Data xsi:type="BusManufacturingStepDataType" id="MSTG-1"> <HashPreviousStage> <di:Reference URI="#PIF-d10aff76c5d149948046"> <di:Transforms> -- GitLab