From bfda73950a8f16c337ab7cc78d7ed1754e777fc9 Mon Sep 17 00:00:00 2001 From: Simon G Date: Tue, 10 Nov 2020 15:45:18 +0100 Subject: [PATCH] #25: fix factories and ctors --- GBase/DataHandling/Factories/IDataHandlerFactory.cs | 2 +- GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs | 2 +- GBase/DataHandling/Factories/IXmlDataReaderFactory.cs | 3 +-- GBase/DataHandling/XmlDataHandler.cs | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/GBase/DataHandling/Factories/IDataHandlerFactory.cs b/GBase/DataHandling/Factories/IDataHandlerFactory.cs index d2b8515..2d0413d 100644 --- a/GBase/DataHandling/Factories/IDataHandlerFactory.cs +++ b/GBase/DataHandling/Factories/IDataHandlerFactory.cs @@ -8,6 +8,6 @@ namespace GBase.DataHandling.Factories { public interface IDataHandlerFactory { - IDataHandler Create(); //TODO: Add correct parameters + IDataHandler Create(); } } \ No newline at end of file diff --git a/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs b/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs index 7d4bac7..7b416c9 100644 --- a/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs +++ b/GBase/DataHandling/Factories/IXmlDataHandlerFactory.cs @@ -15,6 +15,6 @@ namespace GBase.DataHandling.Factories /// Creates an /// /// A newly created instance of the implementation for - IXmlDataHandler Create(); //TODO: Add correct parameters + IXmlDataHandler Create(); } } \ No newline at end of file diff --git a/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs b/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs index 3670de9..ad11818 100644 --- a/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs +++ b/GBase/DataHandling/Factories/IXmlDataReaderFactory.cs @@ -14,8 +14,7 @@ namespace GBase.DataHandling.Factories /// /// Creates an /// - /// The path to the xml file /// A newly created instance of the implementation for - IXmlDataReader Create(string path); + IXmlDataReader Create(); } } \ No newline at end of file diff --git a/GBase/DataHandling/XmlDataHandler.cs b/GBase/DataHandling/XmlDataHandler.cs index 64c2901..34948f6 100644 --- a/GBase/DataHandling/XmlDataHandler.cs +++ b/GBase/DataHandling/XmlDataHandler.cs @@ -52,13 +52,12 @@ namespace GBase.DataHandling /// The factory /// The factory /// The factory - public XmlDataHandler(string path, - IXmlDataReaderFactory xmlDataReaderFactory, + public XmlDataHandler(IXmlDataReaderFactory xmlDataReaderFactory, IXmlDataWriterFactory xmlDataWriterFactory, IXmlDataHandlerCacheFactory xmlDataHandlerCacheFactory) { _xmlDataWriter = xmlDataWriterFactory.Create(); - _xmlDataReader = xmlDataReaderFactory.Create(path); + _xmlDataReader = xmlDataReaderFactory.Create(); _cache = xmlDataHandlerCacheFactory.Create(_xmlDataReader); }