Update of /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13850 Modified Files: AbstractApplicationContext.cs AbstractMessageSource.cs NullMessageSource.cs StaticMessageSource.cs Log Message: reactivated warning 1591 "missing XML doc comment" excluded unused Spring.Core/Spring.Expressions.Parser/ExpressionParserTokenTypes..cs from builds Index: AbstractMessageSource.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** AbstractMessageSource.cs 23 Aug 2007 10:38:02 -0000 1.21 --- AbstractMessageSource.cs 27 Aug 2007 09:38:28 -0000 1.22 *************** *** 547,558 **** /// The base name of the object to use for key lookup. /// </param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> ! protected void ApplyResourcesInternal(object value, string name, CultureInfo cultureInfo) { if (cultureInfo == null) cultureInfo = CultureInfo.CurrentUICulture; ! ApplyResourcesToObject(value, name, cultureInfo); } --- 547,558 ---- /// The base name of the object to use for key lookup. /// </param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> ! protected void ApplyResourcesInternal(object value, string objectName, CultureInfo cultureInfo) { if (cultureInfo == null) cultureInfo = CultureInfo.CurrentUICulture; ! ApplyResourcesToObject(value, objectName, cultureInfo); } *************** *** 565,572 **** /// </summary> /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param> ! /// <param name="culture">The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated.</param> /// <returns>The resolved message from the backing store of message data.</returns> ! protected abstract string ResolveMessage(string code, CultureInfo culture); /// <summary> --- 565,572 ---- /// </summary> /// <param name="code">The code to lookup up, such as 'calculator.noRateSet'.</param> ! /// <param name="cultureInfo">The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated.</param> /// <returns>The resolved message from the backing store of message data.</returns> ! protected abstract string ResolveMessage(string code, CultureInfo cultureInfo); /// <summary> *************** *** 579,583 **** /// </remarks> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 579,583 ---- /// </remarks> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 586,590 **** /// The resolved object or <see langword="null"/> if not found. /// </returns> ! protected abstract object ResolveObject(string code, CultureInfo culture); /// <summary> --- 586,590 ---- /// The resolved object or <see langword="null"/> if not found. /// </returns> ! protected abstract object ResolveObject(string code, CultureInfo cultureInfo); /// <summary> *************** *** 603,611 **** /// The base name of the object to use for key lookup. /// </param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> ! protected abstract void ApplyResourcesToObject(object value, string objectName, CultureInfo culture); --- 603,611 ---- /// The base name of the object to use for key lookup. /// </param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> ! protected abstract void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo); Index: AbstractApplicationContext.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** AbstractApplicationContext.cs 22 Aug 2007 08:49:26 -0000 1.73 --- AbstractApplicationContext.cs 27 Aug 2007 09:38:28 -0000 1.74 *************** *** 818,821 **** --- 818,825 ---- } + /// <summary> + /// Ensures, that predefined ObjectPostProcessors are registered with this ObjectFactory + /// </summary> + /// <param name="objectFactory"></param> protected void EnsureKnownObjectPostProcessors(IConfigurableListableObjectFactory objectFactory) { Index: NullMessageSource.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support/NullMessageSource.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** NullMessageSource.cs 9 Apr 2006 07:18:38 -0000 1.4 --- NullMessageSource.cs 27 Aug 2007 09:38:29 -0000 1.5 *************** *** 70,74 **** /// </summary> /// <param name="code">The code of the message to resolve.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 70,74 ---- /// </summary> /// <param name="code">The code of the message to resolve.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 77,81 **** /// The supplied message <paramref name="code"/> as-is. /// </returns> ! protected override string ResolveMessage(string code, CultureInfo culture) { return code; --- 77,81 ---- /// The supplied message <paramref name="code"/> as-is. /// </returns> ! protected override string ResolveMessage(string code, CultureInfo cultureInfo) { return code; *************** *** 86,90 **** /// </summary> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 86,90 ---- /// </summary> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 93,97 **** /// <see lang="null"/> (always). /// </returns> ! protected override object ResolveObject(string code, CultureInfo culture) { return null; --- 93,97 ---- /// <see lang="null"/> (always). /// </returns> ! protected override object ResolveObject(string code, CultureInfo cultureInfo) { return null; *************** *** 107,116 **** /// The base name of the object to use for key lookup. /// </param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> protected override void ApplyResourcesToObject( ! object value, string objectName, CultureInfo culture) {} } --- 107,116 ---- /// The base name of the object to use for key lookup. /// </param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. /// </param> protected override void ApplyResourcesToObject( ! object value, string objectName, CultureInfo cultureInfo) {} } Index: StaticMessageSource.cs =================================================================== RCS file: /cvsroot/springnet/Spring.Net/src/Spring/Spring.Core/Context/Support/StaticMessageSource.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** StaticMessageSource.cs 9 Apr 2006 07:18:38 -0000 1.14 --- StaticMessageSource.cs 27 Aug 2007 09:38:31 -0000 1.15 *************** *** 21,25 **** #region Imports - using System; using System.Collections; using System.ComponentModel; --- 21,24 ---- *************** *** 67,71 **** /// </summary> /// <param name="code">The code of the message to resolve.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 66,70 ---- /// </summary> /// <param name="code">The code of the message to resolve.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 75,81 **** /// </returns> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveMessage(string, CultureInfo)"/> ! protected override string ResolveMessage(string code, CultureInfo culture) { ! return (string) _messages[GetLookupKey(code, culture)]; } --- 74,80 ---- /// </returns> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveMessage(string, CultureInfo)"/> ! protected override string ResolveMessage(string code, CultureInfo cultureInfo) { ! return (string) _messages[GetLookupKey(code, cultureInfo)]; } *************** *** 84,88 **** /// </summary> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 83,87 ---- /// </summary> /// <param name="code">The code of the object to resolve.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 92,98 **** /// </returns> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveObject(string, CultureInfo)"/> ! protected override object ResolveObject(string code, CultureInfo culture) { ! return _objects[GetLookupKey(code, culture)]; } --- 91,97 ---- /// </returns> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ResolveObject(string, CultureInfo)"/> ! protected override object ResolveObject(string code, CultureInfo cultureInfo) { ! return _objects[GetLookupKey(code, cultureInfo)]; } *************** *** 121,125 **** /// The base name of the object to use for key lookup. /// </param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. --- 120,124 ---- /// The base name of the object to use for key lookup. /// </param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> with which the /// resource is associated. *************** *** 129,139 **** /// </exception> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ApplyResourcesToObject(object, string, CultureInfo)"/> ! protected override void ApplyResourcesToObject( ! object value, string objectName, CultureInfo culture) { #if !NET_1_0 if(value != null) { ! new ComponentResourceManager(value.GetType()).ApplyResources(value, objectName, culture); } #else --- 128,137 ---- /// </exception> /// <seealso cref="Spring.Context.Support.AbstractMessageSource.ApplyResourcesToObject(object, string, CultureInfo)"/> ! protected override void ApplyResourcesToObject(object value, string objectName, CultureInfo cultureInfo) { #if !NET_1_0 if(value != null) { ! new ComponentResourceManager(value.GetType()).ApplyResources(value, objectName, cultureInfo); } #else *************** *** 165,169 **** /// </summary> /// <param name="code">The lookup code.</param> ! /// <param name="culture"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. --- 163,167 ---- /// </summary> /// <param name="code">The lookup code.</param> ! /// <param name="cultureInfo"> /// The <see cref="System.Globalization.CultureInfo"/> to resolve the /// code for. *************** *** 172,178 **** /// The object associated with this lookup code. /// </param> ! public void AddObject(string code, CultureInfo culture, object value) { ! _objects.Add(GetLookupKey(code, culture), value); } --- 170,176 ---- /// The object associated with this lookup code. /// </param> ! public void AddObject(string code, CultureInfo cultureInfo, object value) { ! _objects.Add(GetLookupKey(code, cultureInfo), value); } |
