diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs index c67d405baff4a574900a8e7073262ccbb96c85e7..ac375e108f2f82f5ad1a974aa12b836ce3295011 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs +++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs @@ -3300,6 +3300,15 @@ namespace TUGraz.VectoCommon.Resources { } } + /// <summary> + /// Looks up a localized string similar to VectoOuputMultistage. + /// </summary> + public static string VectoOuputMultistage { + get { + return ResourceManager.GetString("VectoOuputMultistage", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to VectoOutputPrimaryVehicle. /// </summary> diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx index b8eaad1e3afdb502e526cbf96a789711003d67a3..d957901567a159b0e0bc0d910ea02014f068bc86 100644 --- a/VectoCommon/VectoCommon/Resources/XMLNames.resx +++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx @@ -1419,4 +1419,7 @@ <data name="Bus_WaterElectricHeater" xml:space="preserve"> <value>WaterElectricHeater</value> </data> + <data name="VectoOuputMultistage" xml:space="preserve"> + <value>VectoOuputMultistage</value> + </data> </root> \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs index 54f573aef40c22366e22c9f77bb19eea10120b6b..a0f136e535f5ec96c6b0f800867e349721a5bbfe 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/NinjectModules/XMLDeclarationInputDataMultistageV01InjectModule.cs @@ -1,5 +1,6 @@ using Ninject.Modules; using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Interfaces; +using TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl; namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules { @@ -9,6 +10,10 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.NinjectModules { Bind<IXMLDeclarationInputData>().To<XMLDeclarationInputDataProviderMultistageV01>() .Named(XMLDeclarationInputDataProviderMultistageV01.QUALIFIED_XSD_TYPE); + + Bind<IXMLDeclarationInputDataReader>().To<XMLDeclarationInputReaderMultistageV01>() + .Named(XMLDeclarationInputReaderMultistageV01.QUALIFIED_XSD_TYPE); + } } } \ No newline at end of file diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs index 6008ba605ea5fa687067642d837e38763d2afb29..8e374940ce38d104e884ed40985b1bfed1374fb5 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationInputReader.cs @@ -59,13 +59,47 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl public new static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); - public XMLDeclarationInputReaderV20(IXMLDeclarationInputData inputData, XmlNode baseNode) : base(inputData, - baseNode) + public XMLDeclarationInputReaderV20(IXMLDeclarationInputData inputData, XmlNode baseNode) + : base(inputData, baseNode) { } + } + + // --------------------------------------------------------------------------------------- + + public class XMLDeclarationInputReaderMultistageV01 : AbstractComponentReader, IXMLDeclarationInputDataReader + { + + public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1; + + public const string XSD_TYPE = "VectoOuputMultistageType"; + + public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); + + [Inject] + public IDeclarationInjectFactory Factory { protected get; set; } + + protected IDeclarationJobInputData _jobData; + + + public XMLDeclarationInputReaderMultistageV01(IXMLDeclarationInputData inputData, XmlNode baseNode) + : base(inputData, baseNode) { } - } + public IDeclarationJobInputData JobData + { + get { return _jobData ?? (_jobData = CreateComponent(XMLNames.VectoOuputMultistage, JobCreator)); } + } + + protected virtual IDeclarationJobInputData JobCreator(string version, XmlNode node, string arg3) + { + //var job = Factory.CreateJobData(version, BaseNode, InputData, (InputData as IXMLResource).DataSource.SourceFile); + //job.Reader = Factory.CreateJobReader(version, job, JobNode); + //return job; + + return null; + } + } // ---------------------------------------------------------------------------------------