diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs index 4eaedb26a8d29da5f43240118a6bed9282ef49ae..1a41e343178993152dfe328c029a2980b05711ae 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport.cs @@ -66,8 +66,11 @@ namespace TUGraz.VectoCore.OutputData.XML protected IDictionary<Tuple<MissionType, LoadingType>, double> _weightingFactors; - [Obsolete] - public XMLDeclarationReport(IReportWriter writer) : base(writer) { } + [Obsolete] + public XMLDeclarationReport(IReportWriter writer) : base(writer) + { + + } public XMLDeclarationReport(IReportWriter writer, IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory) : base(writer) diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs index fbacfc6107dab9916ce5408e52f04942748b6fee..a23a070da29e6359101524eacc56de2ba86ebbc8 100644 --- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs +++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReport_0_9.cs @@ -23,7 +23,6 @@ namespace TUGraz.VectoCore.OutputData.XML /// </summary> public class XMLDeclarationReportPrimaryVehicle_09 : XMLDeclarationReport { - private readonly IManufacturerReportFactory _mrfFactory; private readonly IVIFReportFactory _vifFactory; protected IXMLVehicleInformationFile VehicleInformationFile; @@ -39,12 +38,9 @@ namespace TUGraz.VectoCore.OutputData.XML } public XMLDeclarationReportPrimaryVehicle_09(IReportWriter writer, IManufacturerReportFactory mrfFactory, - ICustomerInformationFileFactory cifFactory, - IVIFReportFactory vifFactory) : base(writer) + IVIFReportFactory vifFactory) : base(writer, mrfFactory, null) { - _mrfFactory = mrfFactory; - - //_cifFactory = cifFactory; + _vifFactory = vifFactory; } @@ -73,20 +69,7 @@ namespace TUGraz.VectoCore.OutputData.XML iepc, ihpc); - /* code from XMLDeclarationReportPrimaryVehicle - if (modelData.Exempted) { - ManufacturerRpt = new XMLManufacturerReportExeptedPrimaryBus(); - CustomerRpt = new XMLCustomerReportExemptedPrimaryBus(); - VehicleInformationFile = new XMLExemptedPrimaryBusVehicleReport(); - - } else { - ManufacturerRpt = new XMLManufacturerReportPrimaryBus(); - CustomerRpt = new XMLCustomerReport(); - VehicleInformationFile = new XMLPrimaryBusVehicleReport(); - } - - - */ + } @@ -197,17 +180,14 @@ namespace TUGraz.VectoCore.OutputData.XML /// </summary> public class XMLDeclarationReportCompletedVehicle_09 : XMLDeclarationReport { - protected readonly ICustomerInformationFileFactory _cifFactory; - protected readonly IManufacturerReportFactory _mrfFactory; + #region Constructors - public XMLDeclarationReportCompletedVehicle_09(IReportWriter writer) : base(writer) { } + //public XMLDeclarationReportCompletedVehicle_09(IReportWriter writer) : base(writer) { } public XMLDeclarationReportCompletedVehicle_09(IReportWriter writer, IManufacturerReportFactory mrfFactory, ICustomerInformationFileFactory cifFactory, - IVIFReportFactory vifFactory) : base(writer) + IVIFReportFactory vifFactory) : base(writer, mrfFactory, cifFactory) { - _cifFactory = cifFactory; - _mrfFactory = mrfFactory; } #endregion