|
From: Erich E. <oak...@us...> - 2007-08-27 13:57:54
|
Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Xml In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9622/Xml Modified Files: DefaultObjectDefinitionDocumentReader.cs XmlObjectDefinitionReader.cs XmlReaderContext.cs Log Message: added xml doc comments Index: DefaultObjectDefinitionDocumentReader.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DefaultObjectDefinitionDocumentReader.cs 8 Aug 2007 17:47:13 -0000 1.7 --- DefaultObjectDefinitionDocumentReader.cs 27 Aug 2007 13:57:43 -0000 1.8 *************** *** 25,31 **** using System.IO; using System.Xml; - using Common.Logging; - using Spring.Core.IO; using Spring.Objects.Factory.Config; --- 25,29 ---- *************** *** 53,57 **** #region Constants - /// <summary> /// The shared <see cref="Common.Logging.ILog"/> instance for this class (and derived classes). --- 51,54 ---- *************** *** 94,98 **** #region Methods - /// <summary> /// Read object definitions from the given DOM element, and register --- 91,94 ---- *************** *** 116,124 **** --- 112,123 ---- #region Instrumentation + if (log.IsDebugEnabled) { log.Debug("Loading object definitions."); } + #endregion + XmlElement root = doc.DocumentElement; *************** *** 144,163 **** #endregion - } protected virtual void ParseObjectDefinitions(XmlElement root, ObjectDefinitionParserHelper helper) { ! foreach (XmlNode node in root.ChildNodes) { ! if (node.NodeType == XmlNodeType.Element) ! { ! XmlElement element = (XmlElement) node; ! INamespaceParser parser = GetNamespaceParser(element, helper); ! ParserContext parserContext = new ParserContext(helper.ReaderContext, helper); ! parser.ParseElement(element, parserContext); ! } } ! } --- 143,160 ---- #endregion } protected virtual void ParseObjectDefinitions(XmlElement root, ObjectDefinitionParserHelper helper) { ! foreach (XmlNode node in root.ChildNodes) ! { ! if (node.NodeType == XmlNodeType.Element) { ! XmlElement element = (XmlElement) node; ! INamespaceParser parser = GetNamespaceParser(element, helper); ! ParserContext parserContext = new ParserContext(helper.ReaderContext, helper); ! parser.ParseElement(element, parserContext); } ! } } *************** *** 201,206 **** { log.Debug(string.Format( ! CultureInfo.InvariantCulture, ! "Attempting to import object definitions from '{0}'.", location)); } --- 198,203 ---- { log.Debug(string.Format( ! CultureInfo.InvariantCulture, ! "Attempting to import object definitions from '{0}'.", location)); } *************** *** 213,219 **** { ReaderContext.ReportException(resource, null, string.Format( ! CultureInfo.InvariantCulture, ! "Invalid relative resource location '{0}' to import object definitions from.", ! location), ex); } } --- 210,216 ---- { ReaderContext.ReportException(resource, null, string.Format( ! CultureInfo.InvariantCulture, ! "Invalid relative resource location '{0}' to import object definitions from.", ! location), ex); } } *************** *** 239,243 **** protected virtual void RegisterObjectDefinition(XmlElement element, ObjectDefinitionParserHelper helper) { - ObjectDefinitionHolder holder = null; try --- 236,239 ---- *************** *** 254,258 **** catch (Exception ex) { ! throw new ObjectDefinitionStoreException(string.Format("Failed parsing object definition '{0}'", element.OuterXml), ex); } --- 250,255 ---- catch (Exception ex) { ! throw new ObjectDefinitionStoreException( ! string.Format("Failed parsing object definition '{0}'", element.OuterXml), ex); } *************** *** 287,291 **** protected virtual void PostProcessXml(XmlElement root) { - } --- 284,287 ---- *************** *** 305,311 **** protected virtual void PreProcessXml(XmlElement root) { - } protected virtual ObjectDefinitionParserHelper CreateHelper(XmlReaderContext readerContext, XmlElement root) { --- 301,312 ---- protected virtual void PreProcessXml(XmlElement root) { } + /// <summary> + /// Creates an <see cref="ObjectDefinitionParserHelper"/> instance for the given <paramref name="readerContext"/> and <paramref name="root"/> element. + /// </summary> + /// <param name="readerContext">the <see cref="XmlReaderContext"/> to create the <see cref="ObjectDefinitionParserHelper"/> </param> + /// <param name="root">the root <see cref="XmlElement"/> to start reading from</param> + /// <returns>a new <see cref="ObjectDefinitionParserHelper"/> instance</returns> protected virtual ObjectDefinitionParserHelper CreateHelper(XmlReaderContext readerContext, XmlElement root) { *************** *** 330,335 **** } - - #endregion } --- 331,334 ---- Index: XmlObjectDefinitionReader.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Xml/XmlObjectDefinitionReader.cs,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** XmlObjectDefinitionReader.cs 8 Aug 2007 17:47:13 -0000 1.31 --- XmlObjectDefinitionReader.cs 27 Aug 2007 13:57:43 -0000 1.32 *************** *** 311,314 **** --- 311,320 ---- } + /// <summary> + /// Creates the <see cref="XmlReaderContext"/> to be passed along + /// during the object definition reading process. + /// </summary> + /// <param name="resource">The underlying <see cref="IResource"/> that is currently processed.</param> + /// <returns>A new <see cref="XmlReaderContext"/></returns> protected virtual XmlReaderContext CreateReaderContext(IResource resource) { Index: XmlReaderContext.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Objects/Factory/Xml/XmlReaderContext.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** XmlReaderContext.cs 8 Aug 2007 17:47:13 -0000 1.5 --- XmlReaderContext.cs 27 Aug 2007 13:57:43 -0000 1.6 *************** *** 30,37 **** { /// <summary> ! /// Extenstion of <see cref="ReaderContext"/> specific to use with an /// XmlObjectDefinitionReader. /// </summary> /// <remarks>In future will contain access to IXmlParserRegistry</remarks> public class XmlReaderContext : ReaderContext { --- 30,38 ---- { /// <summary> ! /// Extension of <see cref="ReaderContext"/> specific to use with an /// XmlObjectDefinitionReader. /// </summary> /// <remarks>In future will contain access to IXmlParserRegistry</remarks> + /// <version>$Id$</version> public class XmlReaderContext : ReaderContext { |
