http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/OptionConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/OptionConverter.cs b/src/Util/OptionConverter.cs index cc791dc..199ddf7 100644 --- a/src/Util/OptionConverter.cs +++ b/src/Util/OptionConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -43,7 +43,7 @@ namespace log4net.Util #region Private Instance Constructors /// <summary> - /// Initializes a new instance of the <see cref="OptionConverter" /> class. + /// Initializes a new instance of the <see cref="OptionConverter" /> class. /// </summary> /// <remarks> /// <para> @@ -64,7 +64,7 @@ namespace log4net.Util // /// <param name="l">Left array.</param> // /// <param name="r">Right array.</param> // /// <returns>Array containing both left and right arrays.</returns> -// public static string[] ConcatenateArrays(string[] l, string[] r) +// public static string[] ConcatenateArrays(string[] l, string[] r) // { // return (string[])ConcatenateArrays(l, r); // } @@ -75,7 +75,7 @@ namespace log4net.Util // /// <param name="l">Left array</param> // /// <param name="r">Right array</param> // /// <returns>Array containing both left and right arrays.</returns> -// public static Array ConcatenateArrays(Array l, Array r) +// public static Array ConcatenateArrays(Array l, Array r) // { // if (l == null) // { @@ -94,13 +94,13 @@ namespace log4net.Util // // return a; // } - + // /// <summary> // /// Converts string escape characters back to their correct values. // /// </summary> // /// <param name="s">String to convert.</param> // /// <returns>Converted result.</returns> -// public static string ConvertSpecialChars(string s) +// public static string ConvertSpecialChars(string s) // { // if (s == null) // { @@ -109,24 +109,24 @@ namespace log4net.Util // char c; // int len = s.Length; // StringBuilder buf = new StringBuilder(len); -// +// // int i = 0; -// while(i < len) +// while(i < len) // { // c = s[i++]; -// if (c == '\\') +// if (c == '\\') // { // c = s[i++]; // if (c == 'n') c = '\n'; // else if (c == 'r') c = '\r'; // else if (c == 't') c = '\t'; // else if (c == 'f') c = '\f'; -// else if (c == '\b') c = '\b'; -// else if (c == '\"') c = '\"'; -// else if (c == '\'') c = '\''; -// else if (c == '\\') c = '\\'; +// else if (c == '\b') c = '\b'; +// else if (c == '\"') c = '\"'; +// else if (c == '\'') c = '\''; +// else if (c == '\\') c = '\\'; // } -// buf.Append(c); +// buf.Append(c); // } // return buf.ToString(); // } @@ -139,12 +139,12 @@ namespace log4net.Util /// <returns>The <see cref="bool" /> value of <paramref name="argValue" />.</returns> /// <remarks> /// <para> - /// If <paramref name="argValue"/> is "true", then <c>true</c> is returned. - /// If <paramref name="argValue"/> is "false", then <c>false</c> is returned. + /// If <paramref name="argValue"/> is "true", then <c>true</c> is returned. + /// If <paramref name="argValue"/> is "false", then <c>false</c> is returned. /// Otherwise, <paramref name="defaultValue"/> is returned. /// </para> /// </remarks> - public static bool ToBoolean(string argValue, bool defaultValue) + public static bool ToBoolean(string argValue, bool defaultValue) { if (argValue != null && argValue.Length > 0) { @@ -172,16 +172,16 @@ namespace log4net.Util // /// cannot be converted to a <see cref="int" /> value. // /// </para> // /// </remarks> -// public static int ToInt(string argValue, int defaultValue) +// public static int ToInt(string argValue, int defaultValue) // { -// if (argValue != null) +// if (argValue != null) // { // string s = argValue.Trim(); -// try +// try // { // return int.Parse(s, NumberFormatInfo.InvariantInfo); // } -// catch (Exception e) +// catch (Exception e) // { // LogLog.Error(declaringType, "OptionConverter: [" + s + "] is not in proper int form.", e); // } @@ -205,37 +205,37 @@ namespace log4net.Util /// cannot be converted to a <see cref="long" /> value. /// </para> /// </remarks> - public static long ToFileSize(string argValue, long defaultValue) + public static long ToFileSize(string argValue, long defaultValue) { if (argValue == null) { return defaultValue; } - + string s = argValue.Trim().ToUpper(CultureInfo.InvariantCulture); long multiplier = 1; int index; - - if ((index = s.IndexOf("KB")) != -1) - { + + if ((index = s.IndexOf("KB")) != -1) + { multiplier = 1024; s = s.Substring(0, index); } - else if ((index = s.IndexOf("MB")) != -1) + else if ((index = s.IndexOf("MB")) != -1) { multiplier = 1024 * 1024; s = s.Substring(0, index); } - else if ((index = s.IndexOf("GB")) != -1) + else if ((index = s.IndexOf("GB")) != -1) { multiplier = 1024 * 1024 * 1024; s = s.Substring(0, index); - } - if (s != null) + } + if (s != null) { // Try again to remove whitespace between the number and the size specifier s = s.Trim(); - + long longVal; if (SystemInfo.TryParse(s, out longVal)) { @@ -255,7 +255,7 @@ namespace log4net.Util /// <param name="target">The target type to convert to.</param> /// <param name="txt">The string to convert to an object.</param> /// <returns> - /// The object converted from a string or <c>null</c> when the + /// The object converted from a string or <c>null</c> when the /// conversion failed. /// </returns> /// <remarks> @@ -429,14 +429,14 @@ namespace log4net.Util } // /// <summary> -// /// Finds the value corresponding to <paramref name="key"/> in -// /// <paramref name="props"/> and then perform variable substitution +// /// Finds the value corresponding to <paramref name="key"/> in +// /// <paramref name="props"/> and then perform variable substitution // /// on the found value. // /// </summary> // /// <param name="key">The key to lookup.</param> // /// <param name="props">The association to use for lookups.</param> // /// <returns>The substituted result.</returns> -// public static string FindAndSubst(string key, System.Collections.IDictionary props) +// public static string FindAndSubst(string key, System.Collections.IDictionary props) // { // if (props == null) // { @@ -444,20 +444,20 @@ namespace log4net.Util // } // // string v = props[key] as string; -// if (v == null) +// if (v == null) // { -// return null; +// return null; // } -// -// try +// +// try // { // return SubstituteVariables(v, props); -// } -// catch(Exception e) +// } +// catch(Exception e) // { // LogLog.Error(declaringType, "OptionConverter: Bad option value [" + v + "].", e); // return v; -// } +// } // } /// <summary> @@ -477,34 +477,34 @@ namespace log4net.Util /// not be instantiated, then <paramref name="defaultValue"/> is returned. /// </para> /// </remarks> - public static object InstantiateByClassName(string className, Type superClass, object defaultValue) + public static object InstantiateByClassName(string className, Type superClass, object defaultValue) { - if (className != null) + if (className != null) { - try + try { #if NETSTANDARD1_3 Type classObj = SystemInfo.GetTypeFromString(superClass.GetTypeInfo().Assembly, className, true, true); #else Type classObj = SystemInfo.GetTypeFromString(className, true, true); #endif - if (!superClass.IsAssignableFrom(classObj)) + if (!superClass.IsAssignableFrom(classObj)) { LogLog.Error(declaringType, "OptionConverter: A [" + className + "] object is not assignable to a [" + superClass.FullName + "] variable."); - return defaultValue; + return defaultValue; } return Activator.CreateInstance(classObj); } - catch (Exception e) + catch (Exception e) { LogLog.Error(declaringType, "Could not instantiate class [" + className + "].", e); } } - return defaultValue; + return defaultValue; } /// <summary> - /// Performs variable substitution in string <paramref name="value"/> from the + /// Performs variable substitution in string <paramref name="value"/> from the /// values of keys found in <paramref name="props"/>. /// </summary> /// <param name="value">The string on which variable substitution is performed.</param> @@ -526,7 +526,7 @@ namespace log4net.Util /// will set the variable <c>s</c> to "Value of key is value.". /// </para> /// <para> - /// If no value could be found for the specified key, then substitution + /// If no value could be found for the specified key, then substitution /// defaults to an empty string. /// </para> /// <para> @@ -539,55 +539,55 @@ namespace log4net.Util /// </code> /// </para> /// <para> - /// will set <s>s</s> to "Value of nonExistentKey is []". + /// will set <s>s</s> to "Value of nonExistentKey is []". /// </para> /// <para> - /// An Exception is thrown if <paramref name="value"/> contains a start - /// delimiter "${" which is not balanced by a stop delimiter "}". + /// An Exception is thrown if <paramref name="value"/> contains a start + /// delimiter "${" which is not balanced by a stop delimiter "}". /// </para> /// </remarks> - public static string SubstituteVariables(string value, System.Collections.IDictionary props) + public static string SubstituteVariables(string value, System.Collections.IDictionary props) { StringBuilder buf = new StringBuilder(); int i = 0; int j, k; - - while(true) + + while(true) { j = value.IndexOf(DELIM_START, i); - if (j == -1) + if (j == -1) { if (i == 0) { return value; } - else + else { buf.Append(value.Substring(i, value.Length - i)); return buf.ToString(); } } - else + else { buf.Append(value.Substring(i, j - i)); k = value.IndexOf(DELIM_STOP, j); - if (k == -1) + if (k == -1) { throw new LogException("[" + value + "] has no closing brace. Opening brace at position [" + j + "]"); } - else + else { j += DELIM_START_LEN; string key = value.Substring(j, k - j); string replacement = props[key] as string; - if (replacement != null) + if (replacement != null) { buf.Append(replacement); } - i = k + DELIM_STOP_LEN; + i = k + DELIM_STOP_LEN; } } } @@ -598,14 +598,14 @@ namespace log4net.Util #region Private Static Methods /// <summary> - /// Converts the string representation of the name or numeric value of one or + /// Converts the string representation of the name or numeric value of one or /// more enumerated constants to an equivalent enumerated object. /// </summary> /// <param name="enumType">The type to convert to.</param> /// <param name="value">The enum string value.</param> /// <param name="ignoreCase">If <c>true</c>, ignore case; otherwise, regard case.</param> /// <returns>An object of type <paramref name="enumType" /> whose value is represented by <paramref name="value" />.</returns> - private static object ParseEnum(System.Type enumType, string value, bool ignoreCase) + private static object ParseEnum(System.Type enumType, string value, bool ignoreCase) { #if !NETCF return Enum.Parse(enumType, value, ignoreCase); @@ -613,40 +613,40 @@ namespace log4net.Util FieldInfo[] fields = enumType.GetFields(BindingFlags.Public | BindingFlags.Static); string[] names = value.Split(new char[] {','}); - for (int i = 0; i < names.Length; ++i) + for (int i = 0; i < names.Length; ++i) { names[i] = names [i].Trim(); } long retVal = 0; - try + try { // Attempt to convert to numeric type return Enum.ToObject(enumType, Convert.ChangeType(value, typeof(long), CultureInfo.InvariantCulture)); - } + } catch {} - foreach (string name in names) + foreach (string name in names) { bool found = false; - foreach(FieldInfo field in fields) + foreach(FieldInfo field in fields) { - if (String.Compare(name, field.Name, ignoreCase) == 0) + if (String.Compare(name, field.Name, ignoreCase) == 0) { retVal |= ((IConvertible) field.GetValue(null)).ToInt64(CultureInfo.InvariantCulture); found = true; break; } } - if (!found) + if (!found) { throw new ArgumentException("Failed to lookup member [" + name + "] from Enum type [" + enumType.Name + "]"); } } return Enum.ToObject(enumType, retVal); #endif - } + } #endregion Private Static Methods
http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternConverter.cs b/src/Util/PatternConverter.cs index 7b33395..01eb782 100644 --- a/src/Util/PatternConverter.cs +++ b/src/Util/PatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -27,7 +27,7 @@ using log4net.Repository; namespace log4net.Util { /// <summary> - /// Abstract class that provides the formatting functionality that + /// Abstract class that provides the formatting functionality that /// derived classes need. /// </summary> /// <remarks> @@ -51,8 +51,8 @@ namespace log4net.Util /// Initializes a new instance of the <see cref="PatternConverter" /> class. /// </para> /// </remarks> - protected PatternConverter() - { + protected PatternConverter() + { } #endregion Protected Instance Constructors @@ -165,7 +165,7 @@ namespace log4net.Util /// apply those formattings before writing the output. /// </para> /// </remarks> - virtual public void Format(TextWriter writer, object state) + virtual public void Format(TextWriter writer, object state) { if (m_min < 0 && m_max == int.MaxValue) { @@ -195,14 +195,14 @@ namespace log4net.Util } } - if (len < m_min) + if (len < m_min) { - if (m_leftAlign) - { + if (m_leftAlign) + { writer.Write(msg); SpacePad(writer, m_min - len); } - else + else { SpacePad(writer, m_min - len); writer.Write(msg); @@ -213,7 +213,7 @@ namespace log4net.Util writer.Write(msg); } } - } + } private static readonly string[] SPACES = { " ", " ", " ", " ", // 1,2,4,8 spaces " ", // 16 spaces @@ -229,22 +229,22 @@ namespace log4net.Util /// Fast space padding method. /// </para> /// </remarks> - protected static void SpacePad(TextWriter writer, int length) + protected static void SpacePad(TextWriter writer, int length) { - while(length >= 32) + while(length >= 32) { writer.Write(SPACES[5]); length -= 32; } - - for(int i = 4; i >= 0; i--) - { - if ((length & (1<<i)) != 0) + + for(int i = 4; i >= 0; i--) + { + if ((length & (1<<i)) != 0) { writer.Write(SPACES[i]); } } - } + } #endregion Public Instance Methods @@ -386,7 +386,7 @@ namespace log4net.Util private PropertiesDictionary properties; /// <summary> - /// + /// /// </summary> public PropertiesDictionary Properties { http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternParser.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternParser.cs b/src/Util/PatternParser.cs index bfe4452..cec4aa8 100644 --- a/src/Util/PatternParser.cs +++ b/src/Util/PatternParser.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -48,11 +48,11 @@ namespace log4net.Util /// <param name="pattern">The pattern to parse.</param> /// <remarks> /// <para> - /// Initializes a new instance of the <see cref="PatternParser" /> class + /// Initializes a new instance of the <see cref="PatternParser" /> class /// with the specified pattern string. /// </para> /// </remarks> - public PatternParser(string pattern) + public PatternParser(string pattern) { m_pattern = pattern; } @@ -164,7 +164,7 @@ namespace log4net.Util return s2.Length.CompareTo(s1.Length); } - + #endregion } @@ -277,7 +277,7 @@ namespace log4net.Util { // Seen option start offset++; - + int optEnd = pattern.IndexOf('}', offset); if (optEnd < 0) { @@ -343,7 +343,7 @@ namespace log4net.Util LogLog.Error(declaringType, "Failed to create instance of Type [" + converterInfo.Type.FullName + "] using default constructor. Exception: " + createInstanceEx.ToString()); } - // formattingInfo variable is an instance variable, occasionally reset + // formattingInfo variable is an instance variable, occasionally reset // and used over and over again pc.FormattingInfo = formattingInfo; pc.Option = option; @@ -360,19 +360,19 @@ namespace log4net.Util } /// <summary> - /// Resets the internal state of the parser and adds the specified pattern converter + /// Resets the internal state of the parser and adds the specified pattern converter /// to the chain. /// </summary> /// <param name="pc">The pattern converter to add.</param> - private void AddConverter(PatternConverter pc) + private void AddConverter(PatternConverter pc) { // Add the pattern converter to the list. - if (m_head == null) + if (m_head == null) { m_head = m_tail = pc; } - else + else { // Set the next converter on the tail // Update the tail reference @@ -387,7 +387,7 @@ namespace log4net.Util #region Private Constants private const char ESCAPE_CHAR = '%'; - + #endregion Private Constants #region Private Instance Fields http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternString.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternString.cs b/src/Util/PatternString.cs index a8f14ce..1d37bde 100644 --- a/src/Util/PatternString.cs +++ b/src/Util/PatternString.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -40,7 +40,7 @@ namespace log4net.Util /// </para> /// <para> /// This class functions similarly to the <see cref="log4net.Layout.PatternLayout"/> - /// in that it accepts a pattern and renders it to a string. Unlike the + /// in that it accepts a pattern and renders it to a string. Unlike the /// <see cref="log4net.Layout.PatternLayout"/> however the <c>PatternString</c> /// does not render the properties of a specific <see cref="LoggingEvent"/> but /// of the process in general. @@ -74,12 +74,12 @@ namespace log4net.Util /// <term>date</term> /// <description> /// <para> - /// Used to output the current date and time in the local time zone. + /// Used to output the current date and time in the local time zone. /// To output the date in universal time use the <c>%utcdate</c> pattern. - /// The date conversion - /// specifier may be followed by a <i>date format specifier</i> enclosed + /// The date conversion + /// specifier may be followed by a <i>date format specifier</i> enclosed /// between braces. For example, <b>%date{HH:mm:ss,fff}</b> or - /// <b>%date{dd MMM yyyy HH:mm:ss,fff}</b>. If no date format specifier is + /// <b>%date{dd MMM yyyy HH:mm:ss,fff}</b>. If no date format specifier is /// given then ISO8601 format is /// assumed (<see cref="log4net.DateFormatter.Iso8601DateFormatter"/>). /// </para> @@ -90,10 +90,10 @@ namespace log4net.Util /// <para> /// For better results it is recommended to use the log4net date /// formatters. These can be specified using one of the strings - /// "ABSOLUTE", "DATE" and "ISO8601" for specifying - /// <see cref="log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, - /// <see cref="log4net.DateFormatter.DateTimeDateFormatter"/> and respectively - /// <see cref="log4net.DateFormatter.Iso8601DateFormatter"/>. For example, + /// "ABSOLUTE", "DATE" and "ISO8601" for specifying + /// <see cref="log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, + /// <see cref="log4net.DateFormatter.DateTimeDateFormatter"/> and respectively + /// <see cref="log4net.DateFormatter.Iso8601DateFormatter"/>. For example, /// <b>%date{ISO8601}</b> or <b>%date{ABSOLUTE}</b>. /// </para> /// <para> @@ -106,7 +106,7 @@ namespace log4net.Util /// <term>env</term> /// <description> /// <para> - /// Used to output the a specific environment variable. The key to + /// Used to output the a specific environment variable. The key to /// lookup must be specified within braces and directly following the /// pattern specifier, e.g. <b>%env{COMPUTERNAME}</b> would include the value /// of the <c>COMPUTERNAME</c> environment variable. @@ -133,10 +133,10 @@ namespace log4net.Util /// characters. /// </para> /// <para> - /// This conversion pattern name offers the same performance as using - /// non-portable line separator strings such as "\n", or "\r\n". + /// This conversion pattern name offers the same performance as using + /// non-portable line separator strings such as "\n", or "\r\n". /// Thus, it is the preferred way of specifying a line separator. - /// </para> + /// </para> /// </description> /// </item> /// <item> @@ -151,13 +151,13 @@ namespace log4net.Util /// <term>property</term> /// <description> /// <para> - /// Used to output a specific context property. The key to + /// Used to output a specific context property. The key to /// lookup must be specified within braces and directly following the /// pattern specifier, e.g. <b>%property{user}</b> would include the value /// from the property that is keyed by the string 'user'. Each property value /// that is to be included in the log must be specified separately. - /// Properties are stored in logging contexts. By default - /// the <c>log4net:HostName</c> property is set to the name of machine on + /// Properties are stored in logging contexts. By default + /// the <c>log4net:HostName</c> property is set to the name of machine on /// which the event was originally logged. /// </para> /// <para> @@ -179,7 +179,7 @@ namespace log4net.Util /// <item> /// <term>the global properties</term> /// <description> - /// The <see cref="GlobalContext.Properties"/> that are set globally. These + /// The <see cref="GlobalContext.Properties"/> that are set globally. These /// properties are shared by all the threads in the AppDomain. /// </description> /// </item> @@ -210,11 +210,11 @@ namespace log4net.Util /// <term>utcdate</term> /// <description> /// <para> - /// Used to output the date of the logging event in universal time. - /// The date conversion - /// specifier may be followed by a <i>date format specifier</i> enclosed + /// Used to output the date of the logging event in universal time. + /// The date conversion + /// specifier may be followed by a <i>date format specifier</i> enclosed /// between braces. For example, <b>%utcdate{HH:mm:ss,fff}</b> or - /// <b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>. If no date format specifier is + /// <b>%utcdate{dd MMM yyyy HH:mm:ss,fff}</b>. If no date format specifier is /// given then ISO8601 format is /// assumed (<see cref="log4net.DateFormatter.Iso8601DateFormatter"/>). /// </para> @@ -225,10 +225,10 @@ namespace log4net.Util /// <para> /// For better results it is recommended to use the log4net date /// formatters. These can be specified using one of the strings - /// "ABSOLUTE", "DATE" and "ISO8601" for specifying - /// <see cref="log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, - /// <see cref="log4net.DateFormatter.DateTimeDateFormatter"/> and respectively - /// <see cref="log4net.DateFormatter.Iso8601DateFormatter"/>. For example, + /// "ABSOLUTE", "DATE" and "ISO8601" for specifying + /// <see cref="log4net.DateFormatter.AbsoluteTimeDateFormatter"/>, + /// <see cref="log4net.DateFormatter.DateTimeDateFormatter"/> and respectively + /// <see cref="log4net.DateFormatter.Iso8601DateFormatter"/>. For example, /// <b>%utcdate{ISO8601}</b> or <b>%utcdate{ABSOLUTE}</b>. /// </para> /// <para> @@ -252,7 +252,7 @@ namespace log4net.Util /// <see cref="M:AddConverter(string, Type)" />. /// </para> /// <para> - /// See the <see cref="log4net.Layout.PatternLayout"/> for details on the + /// See the <see cref="log4net.Layout.PatternLayout"/> for details on the /// <i>format modifiers</i> supported by the patterns. /// </para> /// </remarks> @@ -269,12 +269,12 @@ namespace log4net.Util #endregion Static Fields #region Member Variables - + /// <summary> /// the pattern /// </summary> private string m_pattern; - + /// <summary> /// the head of the pattern converter chain /// </summary> @@ -356,7 +356,7 @@ namespace log4net.Util } #endregion - + /// <summary> /// Gets or sets the pattern formatting string /// </summary> @@ -384,17 +384,17 @@ namespace log4net.Util /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> - virtual public void ActivateOptions() + virtual public void ActivateOptions() { m_head = CreatePatternParser(m_pattern).Parse(); } @@ -413,7 +413,7 @@ namespace log4net.Util /// custom conversion pattern name. /// </para> /// </remarks> - private PatternParser CreatePatternParser(string pattern) + private PatternParser CreatePatternParser(string pattern) { PatternParser patternParser = new PatternParser(pattern); @@ -433,7 +433,7 @@ namespace log4net.Util return patternParser; } - + /// <summary> /// Produces a formatted string as specified by the conversion pattern. /// </summary> @@ -443,7 +443,7 @@ namespace log4net.Util /// Format the pattern to the <paramref name="writer"/>. /// </para> /// </remarks> - public void Format(TextWriter writer) + public void Format(TextWriter writer) { if (writer == null) { @@ -453,7 +453,7 @@ namespace log4net.Util PatternConverter c = m_head; // loop through the chain of pattern converters - while(c != null) + while(c != null) { c.Format(writer, null); c = c.Next; @@ -469,7 +469,7 @@ namespace log4net.Util /// Format the pattern to a string. /// </para> /// </remarks> - public string Format() + public string Format() { StringWriter writer = new StringWriter(System.Globalization.CultureInfo.InvariantCulture); Format(writer); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/AppDomainPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/AppDomainPatternConverter.cs b/src/Util/PatternStringConverters/AppDomainPatternConverter.cs index 9b11002..1e3f41a 100644 --- a/src/Util/PatternStringConverters/AppDomainPatternConverter.cs +++ b/src/Util/PatternStringConverters/AppDomainPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -34,7 +34,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal sealed class AppDomainPatternConverter : PatternConverter + internal sealed class AppDomainPatternConverter : PatternConverter { /// <summary> /// Write the name of the current AppDomain to the output @@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConverters /// Writes name of the current AppDomain to the output <paramref name="writer"/>. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { writer.Write( SystemInfo.ApplicationFriendlyName ); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/AppSettingPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/AppSettingPatternConverter.cs b/src/Util/PatternStringConverters/AppSettingPatternConverter.cs index ce3bba4..9a8c9eb 100644 --- a/src/Util/PatternStringConverters/AppSettingPatternConverter.cs +++ b/src/Util/PatternStringConverters/AppSettingPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/DatePatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/DatePatternConverter.cs b/src/Util/PatternStringConverters/DatePatternConverter.cs index 6def66f..506d31e 100644 --- a/src/Util/PatternStringConverters/DatePatternConverter.cs +++ b/src/Util/PatternStringConverters/DatePatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -30,11 +30,11 @@ namespace log4net.Util.PatternStringConverters /// </summary> /// <remarks> /// <para> - /// Date pattern converter, uses a <see cref="IDateFormatter"/> to format + /// Date pattern converter, uses a <see cref="IDateFormatter"/> to format /// the current date and time to the writer as a string. /// </para> /// <para> - /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines + /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines /// the formatting of the date. The following values are allowed: /// <list type="definition"> /// <listheader> @@ -44,31 +44,31 @@ namespace log4net.Util.PatternStringConverters /// <item> /// <term>ISO8601</term> /// <description> - /// Uses the <see cref="Iso8601DateFormatter"/> formatter. + /// Uses the <see cref="Iso8601DateFormatter"/> formatter. /// Formats using the <c>"yyyy-MM-dd HH:mm:ss,fff"</c> pattern. /// </description> /// </item> /// <item> /// <term>DATE</term> /// <description> - /// Uses the <see cref="DateTimeDateFormatter"/> formatter. + /// Uses the <see cref="DateTimeDateFormatter"/> formatter. /// Formats using the <c>"dd MMM yyyy HH:mm:ss,fff"</c> for example, <c>"06 Nov 1994 15:49:37,459"</c>. /// </description> /// </item> /// <item> /// <term>ABSOLUTE</term> /// <description> - /// Uses the <see cref="AbsoluteTimeDateFormatter"/> formatter. + /// Uses the <see cref="AbsoluteTimeDateFormatter"/> formatter. /// Formats using the <c>"HH:mm:ss,fff"</c> for example, <c>"15:49:37,459"</c>. /// </description> /// </item> /// <item> /// <term>other</term> /// <description> - /// Any other pattern string uses the <see cref="SimpleDateFormatter"/> formatter. - /// This formatter passes the pattern string to the <see cref="DateTime"/> + /// Any other pattern string uses the <see cref="SimpleDateFormatter"/> formatter. + /// This formatter passes the pattern string to the <see cref="DateTime"/> /// <see cref="M:DateTime.ToString(string)"/> method. - /// For details on valid patterns see + /// For details on valid patterns see /// <a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemglobalizationdatetimeformatinfoclasstopic.asp";>DateTimeFormatInfo Class</a>. /// </description> /// </item> @@ -91,7 +91,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> protected IDateFormatter m_dateFormatter; - + #region Implementation of IOptionHandler /// <summary> @@ -100,13 +100,13 @@ namespace log4net.Util.PatternStringConverters /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> @@ -118,7 +118,7 @@ namespace log4net.Util.PatternStringConverters { dateFormatStr = AbsoluteTimeDateFormatter.Iso8601TimeDateFormat; } - + if (SystemInfo.EqualsIgnoringCase(dateFormatStr, AbsoluteTimeDateFormatter.Iso8601TimeDateFormat)) { m_dateFormatter = new Iso8601DateFormatter(); @@ -133,15 +133,15 @@ namespace log4net.Util.PatternStringConverters } else { - try + try { m_dateFormatter = new SimpleDateFormatter(dateFormatStr); } - catch (Exception e) + catch (Exception e) { LogLog.Error(declaringType, "Could not instantiate SimpleDateFormatter with ["+dateFormatStr+"]", e); m_dateFormatter = new Iso8601DateFormatter(); - } + } } } @@ -161,13 +161,13 @@ namespace log4net.Util.PatternStringConverters /// The date and time passed is in the local time zone. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { - try + try { m_dateFormatter.FormatDate(DateTime.Now, writer); } - catch (Exception ex) + catch (Exception ex) { LogLog.Error(declaringType, "Error occurred while converting date.", ex); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs b/src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs index a6dd221..a216cea 100644 --- a/src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs +++ b/src/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -30,7 +30,7 @@ namespace log4net.Util.PatternStringConverters /// <remarks> /// <para> /// Write an special path environment folder path to the output writer. - /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines + /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines /// the name of the variable to output. <see cref="log4net.Util.PatternConverter.Option"/> /// should be a value in the <see cref="System.Environment.SpecialFolder" /> enumeration. /// </para> @@ -69,8 +69,8 @@ namespace log4net.Util.PatternStringConverters } catch (System.Security.SecurityException secEx) { - // This security exception will occur if the caller does not have - // unrestricted environment permission. If this occurs the expansion + // This security exception will occur if the caller does not have + // unrestricted environment permission. If this occurs the expansion // will be skipped with the following warning message. LogLog.Debug(declaringType, "Security exception while trying to expand environment variables. Error Ignored. No Expansion.", secEx); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs b/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs index 7674e37..4e07d10 100644 --- a/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs +++ b/src/Util/PatternStringConverters/EnvironmentPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -36,7 +36,7 @@ namespace log4net.Util.PatternStringConverters /// <remarks> /// <para> /// Write an environment variable to the output writer. - /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines + /// The value of the <see cref="log4net.Util.PatternConverter.Option"/> determines /// the name of the variable to output. /// </para> /// </remarks> @@ -56,16 +56,16 @@ namespace log4net.Util.PatternStringConverters /// property. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { - try + try { if (this.Option != null && this.Option.Length > 0) { // Lookup the environment variable string envValue = Environment.GetEnvironmentVariable(this.Option); -#if NET_2_0 +#if NET_2_0 // If we didn't see it for the process, try a user level variable. if (envValue == null) { @@ -77,7 +77,7 @@ namespace log4net.Util.PatternStringConverters { envValue = Environment.GetEnvironmentVariable(this.Option, EnvironmentVariableTarget.Machine); } -#endif +#endif if (envValue != null && envValue.Length > 0) { @@ -87,12 +87,12 @@ namespace log4net.Util.PatternStringConverters } catch(System.Security.SecurityException secEx) { - // This security exception will occur if the caller does not have - // unrestricted environment permission. If this occurs the expansion + // This security exception will occur if the caller does not have + // unrestricted environment permission. If this occurs the expansion // will be skipped with the following warning message. LogLog.Debug(declaringType, "Security exception while trying to expand environment variables. Error Ignored. No Expansion.", secEx); } - catch (Exception ex) + catch (Exception ex) { LogLog.Error(declaringType, "Error occurred while converting environment variable.", ex); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/IdentityPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/IdentityPatternConverter.cs b/src/Util/PatternStringConverters/IdentityPatternConverter.cs index d92a292..4dc2fa5 100644 --- a/src/Util/PatternStringConverters/IdentityPatternConverter.cs +++ b/src/Util/PatternStringConverters/IdentityPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -34,7 +34,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal sealed class IdentityPatternConverter : PatternConverter + internal sealed class IdentityPatternConverter : PatternConverter { /// <summary> /// Write the current thread identity to the output @@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConverters /// Writes the current thread identity to the output <paramref name="writer"/>. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { #if (NETCF || SSCLI || NETSTANDARD1_3) // On compact framework there's no notion of current thread principals @@ -54,7 +54,7 @@ namespace log4net.Util.PatternStringConverters #else try { - if (System.Threading.Thread.CurrentPrincipal != null && + if (System.Threading.Thread.CurrentPrincipal != null && System.Threading.Thread.CurrentPrincipal.Identity != null && System.Threading.Thread.CurrentPrincipal.Identity.Name != null) { @@ -63,7 +63,7 @@ namespace log4net.Util.PatternStringConverters } catch(System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current thread principal. Error Ignored."); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/LiteralPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/LiteralPatternConverter.cs b/src/Util/PatternStringConverters/LiteralPatternConverter.cs index b40925a..1a80459 100644 --- a/src/Util/PatternStringConverters/LiteralPatternConverter.cs +++ b/src/Util/PatternStringConverters/LiteralPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -30,13 +30,13 @@ namespace log4net.Util.PatternStringConverters /// </summary> /// <remarks> /// <para> - /// Writes the literal string value specified in the - /// <see cref="log4net.Util.PatternConverter.Option"/> property to + /// Writes the literal string value specified in the + /// <see cref="log4net.Util.PatternConverter.Option"/> property to /// the output. /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal class LiteralPatternConverter : PatternConverter + internal class LiteralPatternConverter : PatternConverter { /// <summary> /// Set the next converter in the chain @@ -48,7 +48,7 @@ namespace log4net.Util.PatternStringConverters /// Special case the building of the pattern converter chain /// for <see cref="LiteralPatternConverter"/> instances. Two adjacent /// literals in the pattern can be represented by a single combined - /// pattern converter. This implementation detects when a + /// pattern converter. This implementation detects when a /// <see cref="LiteralPatternConverter"/> is added to the chain /// after this converter and combines its value with this converter's /// literal value. @@ -84,7 +84,7 @@ namespace log4net.Util.PatternStringConverters /// to the output <paramref name="writer"/>. /// </para> /// </remarks> - override public void Format(TextWriter writer, object state) + override public void Format(TextWriter writer, object state) { writer.Write(Option); } @@ -99,7 +99,7 @@ namespace log4net.Util.PatternStringConverters /// This method is not used. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { throw new InvalidOperationException("Should never get here because of the overridden Format method"); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/NewLinePatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/NewLinePatternConverter.cs b/src/Util/PatternStringConverters/NewLinePatternConverter.cs index 2ba276f..bfb47e3 100644 --- a/src/Util/PatternStringConverters/NewLinePatternConverter.cs +++ b/src/Util/PatternStringConverters/NewLinePatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -55,13 +55,13 @@ namespace log4net.Util.PatternStringConverters /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs b/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs index 2d6a5a1..687e16b 100644 --- a/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs +++ b/src/Util/PatternStringConverters/ProcessIdPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -34,7 +34,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal sealed class ProcessIdPatternConverter : PatternConverter + internal sealed class ProcessIdPatternConverter : PatternConverter { /// <summary> /// Write the current process ID to the output @@ -49,7 +49,7 @@ namespace log4net.Util.PatternStringConverters #if NET_4_0 || MONO_4_0 || NETSTANDARD1_3 [System.Security.SecuritySafeCritical] #endif - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { #if (NETCF || SSCLI) // On compact framework there is no System.Diagnostics.Process class @@ -61,7 +61,7 @@ namespace log4net.Util.PatternStringConverters } catch(System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current process id. Error Ignored."); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/PropertyPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/PropertyPatternConverter.cs b/src/Util/PatternStringConverters/PropertyPatternConverter.cs index 3124b31..4b3d47b 100644 --- a/src/Util/PatternStringConverters/PropertyPatternConverter.cs +++ b/src/Util/PatternStringConverters/PropertyPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -35,7 +35,7 @@ namespace log4net.Util.PatternStringConverters /// <para> /// This pattern converter reads the thread and global properties. /// The thread properties take priority over global properties. - /// See <see cref="ThreadContext.Properties"/> for details of the + /// See <see cref="ThreadContext.Properties"/> for details of the /// thread properties. See <see cref="GlobalContext.Properties"/> for /// details of the global properties. /// </para> @@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal sealed class PropertyPatternConverter : PatternConverter + internal sealed class PropertyPatternConverter : PatternConverter { /// <summary> /// Write the property value to the output @@ -64,7 +64,7 @@ namespace log4net.Util.PatternStringConverters /// then all the properties are written as key value pairs. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { CompositeProperties compositeProperties = new CompositeProperties(); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/RandomStringPatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/RandomStringPatternConverter.cs b/src/Util/PatternStringConverters/RandomStringPatternConverter.cs index dc11de9..70cffdd 100644 --- a/src/Util/PatternStringConverters/RandomStringPatternConverter.cs +++ b/src/Util/PatternStringConverters/RandomStringPatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -65,13 +65,13 @@ namespace log4net.Util.PatternStringConverters /// <remarks> /// <para> /// This is part of the <see cref="IOptionHandler"/> delayed object - /// activation scheme. The <see cref="ActivateOptions"/> method must + /// activation scheme. The <see cref="ActivateOptions"/> method must /// be called on this object after the configuration properties have /// been set. Until <see cref="ActivateOptions"/> is called this - /// object is in an undefined state and must not be used. + /// object is in an undefined state and must not be used. /// </para> /// <para> - /// If any of the configuration properties are modified then + /// If any of the configuration properties are modified then /// <see cref="ActivateOptions"/> must be called again. /// </para> /// </remarks> @@ -88,7 +88,7 @@ namespace log4net.Util.PatternStringConverters else { LogLog.Error(declaringType, "RandomStringPatternConverter: Could not convert Option ["+optionStr+"] to Length Int32"); - } + } } } @@ -104,9 +104,9 @@ namespace log4net.Util.PatternStringConverters /// Write a randoim string to the output <paramref name="writer"/>. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { - try + try { lock(s_random) { @@ -134,7 +134,7 @@ namespace log4net.Util.PatternStringConverters } } } - catch (Exception ex) + catch (Exception ex) { LogLog.Error(declaringType, "Error occurred while converting.", ex); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/UserNamePatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/UserNamePatternConverter.cs b/src/Util/PatternStringConverters/UserNamePatternConverter.cs index 0f8dffb..0fbaad7 100644 --- a/src/Util/PatternStringConverters/UserNamePatternConverter.cs +++ b/src/Util/PatternStringConverters/UserNamePatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -34,7 +34,7 @@ namespace log4net.Util.PatternStringConverters /// </para> /// </remarks> /// <author>Nicko Cadell</author> - internal sealed class UserNamePatternConverter : PatternConverter + internal sealed class UserNamePatternConverter : PatternConverter { /// <summary> /// Write the current threads username to the output @@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConverters /// Write the current threads username to the output <paramref name="writer"/>. /// </para> /// </remarks> - override protected void Convert(TextWriter writer, object state) + override protected void Convert(TextWriter writer, object state) { #if (NETCF || SSCLI || NETSTANDARD1_3) // On compact framework there's no notion of current Windows user @@ -63,7 +63,7 @@ namespace log4net.Util.PatternStringConverters } catch(System.Security.SecurityException) { - // This security exception will occur if the caller does not have + // This security exception will occur if the caller does not have // some undefined set of SecurityPermission flags. LogLog.Debug(declaringType, "Security exception while trying to get current windows identity. Error Ignored."); http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PatternStringConverters/UtcDatePatternConverter.cs ---------------------------------------------------------------------- diff --git a/src/Util/PatternStringConverters/UtcDatePatternConverter.cs b/src/Util/PatternStringConverters/UtcDatePatternConverter.cs index a2bf590..155314c 100644 --- a/src/Util/PatternStringConverters/UtcDatePatternConverter.cs +++ b/src/Util/PatternStringConverters/UtcDatePatternConverter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -32,7 +32,7 @@ namespace log4net.Util.PatternStringConverters /// </summary> /// <remarks> /// <para> - /// Date pattern converter, uses a <see cref="IDateFormatter"/> to format + /// Date pattern converter, uses a <see cref="IDateFormatter"/> to format /// the current date and time in Universal time. /// </para> /// <para> @@ -60,11 +60,11 @@ namespace log4net.Util.PatternStringConverters /// <seealso cref="DatePatternConverter"/> override protected void Convert(TextWriter writer, object state) { - try + try { m_dateFormatter.FormatDate(DateTime.UtcNow, writer); } - catch (Exception ex) + catch (Exception ex) { LogLog.Error(declaringType, "Error occurred while converting date.", ex); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/PropertiesDictionary.cs ---------------------------------------------------------------------- diff --git a/src/Util/PropertiesDictionary.cs b/src/Util/PropertiesDictionary.cs index d2e48d5..7c6ec97 100644 --- a/src/Util/PropertiesDictionary.cs +++ b/src/Util/PropertiesDictionary.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -31,7 +31,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// While this collection is serializable only member + /// While this collection is serializable only member /// objects that are serializable will /// be serialized along with this collection. /// </para> @@ -77,7 +77,7 @@ namespace log4net.Util #if !(NETCF || NETSTANDARD1_3) /// <summary> - /// Initializes a new instance of the <see cref="PropertiesDictionary" /> class + /// Initializes a new instance of the <see cref="PropertiesDictionary" /> class /// with serialized data. /// </summary> /// <param name="info">The <see cref="SerializationInfo" /> that holds the serialized object data.</param> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/ProtectCloseTextWriter.cs ---------------------------------------------------------------------- diff --git a/src/Util/ProtectCloseTextWriter.cs b/src/Util/ProtectCloseTextWriter.cs index cd610e2..a15fcfd 100644 --- a/src/Util/ProtectCloseTextWriter.cs +++ b/src/Util/ProtectCloseTextWriter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -30,7 +30,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// This writer is used in special cases where it is necessary + /// This writer is used in special cases where it is necessary /// to protect a writer from being closed by a client. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/QuietTextWriter.cs ---------------------------------------------------------------------- diff --git a/src/Util/QuietTextWriter.cs b/src/Util/QuietTextWriter.cs index 81629b7..5363523 100644 --- a/src/Util/QuietTextWriter.cs +++ b/src/Util/QuietTextWriter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -29,7 +29,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// <see cref="QuietTextWriter"/> does not throw exceptions when things go wrong. + /// <see cref="QuietTextWriter"/> does not throw exceptions when things go wrong. /// Instead, it delegates error handling to its <see cref="IErrorHandler"/>. /// </para> /// </remarks> @@ -85,7 +85,7 @@ namespace log4net.Util } m_errorHandler = value; } - } + } /// <summary> /// Gets a value indicating whether this writer is closed. @@ -116,18 +116,18 @@ namespace log4net.Util /// Writes a character to the underlying writer /// </para> /// </remarks> - public override void Write(char value) + public override void Write(char value) { - try + try { base.Write(value); - } - catch(Exception e) + } + catch(Exception e) { m_errorHandler.Error("Failed to write [" + value + "].", e, ErrorCode.WriteFailure); } } - + /// <summary> /// Writes a buffer to the underlying writer /// </summary> @@ -139,18 +139,18 @@ namespace log4net.Util /// Writes a buffer to the underlying writer /// </para> /// </remarks> - public override void Write(char[] buffer, int index, int count) + public override void Write(char[] buffer, int index, int count) { - try + try { base.Write(buffer, index, count); - } - catch(Exception e) + } + catch(Exception e) { m_errorHandler.Error("Failed to write buffer.", e, ErrorCode.WriteFailure); } } - + /// <summary> /// Writes a string to the output. /// </summary> @@ -160,13 +160,13 @@ namespace log4net.Util /// Writes a string to the output. /// </para> /// </remarks> - override public void Write(string value) + override public void Write(string value) { - try + try { base.Write(value); - } - catch(Exception e) + } + catch(Exception e) { m_errorHandler.Error("Failed to write [" + value + "].", e, ErrorCode.WriteFailure); } http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/ReadOnlyPropertiesDictionary.cs ---------------------------------------------------------------------- diff --git a/src/Util/ReadOnlyPropertiesDictionary.cs b/src/Util/ReadOnlyPropertiesDictionary.cs index fba6c1a..26b3adc 100644 --- a/src/Util/ReadOnlyPropertiesDictionary.cs +++ b/src/Util/ReadOnlyPropertiesDictionary.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -35,7 +35,7 @@ namespace log4net.Util /// This collection is readonly and cannot be modified. /// </para> /// <para> - /// While this collection is serializable only member + /// While this collection is serializable only member /// objects that are serializable will /// be serialized along with this collection. /// </para> @@ -100,7 +100,7 @@ namespace log4net.Util /// <param name="context">The <see cref="StreamingContext" /> that contains contextual information about the source or destination.</param> /// <remarks> /// <para> - /// Initializes a new instance of the <see cref="ReadOnlyPropertiesDictionary" /> class + /// Initializes a new instance of the <see cref="ReadOnlyPropertiesDictionary" /> class /// with serialized data. /// </para> /// </remarks> @@ -224,7 +224,7 @@ namespace log4net.Util #endif if (entryKey != null && entryValue != null && isSerializable) { - // Store the keys as an Xml encoded local name as it may contain colons (':') + // Store the keys as an Xml encoded local name as it may contain colons (':') // which are NOT escaped by the Xml Serialization framework. // This must be a bug in the serialization framework as we cannot be expected // to know the implementation details of all the possible transport layers. http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/ReaderWriterLock.cs ---------------------------------------------------------------------- diff --git a/src/Util/ReaderWriterLock.cs b/src/Util/ReaderWriterLock.cs index 807a3da..b41bb29 100644 --- a/src/Util/ReaderWriterLock.cs +++ b/src/Util/ReaderWriterLock.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -33,16 +33,16 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// <c>ReaderWriterLock</c> is used to synchronize access to a resource. - /// At any given time, it allows either concurrent read access for - /// multiple threads, or write access for a single thread. In a - /// situation where a resource is changed infrequently, a - /// <c>ReaderWriterLock</c> provides better throughput than a simple + /// <c>ReaderWriterLock</c> is used to synchronize access to a resource. + /// At any given time, it allows either concurrent read access for + /// multiple threads, or write access for a single thread. In a + /// situation where a resource is changed infrequently, a + /// <c>ReaderWriterLock</c> provides better throughput than a simple /// one-at-a-time lock, such as <see cref="System.Threading.Monitor"/>. /// </para> /// <para> - /// If a platform does not support a <c>System.Threading.ReaderWriterLock</c> - /// implementation then all readers and writers are serialized. Therefore + /// If a platform does not support a <c>System.Threading.ReaderWriterLock</c> + /// implementation then all readers and writers are serialized. Therefore /// the caller must not rely on multiple simultaneous readers. /// </para> /// </remarks> @@ -72,7 +72,7 @@ namespace log4net.Util } #endregion Private Instance Constructors - + #region Public Methods /// <summary> @@ -80,7 +80,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// <see cref="AcquireReaderLock"/> blocks if a different thread has the writer + /// <see cref="AcquireReaderLock"/> blocks if a different thread has the writer /// lock, or if at least one thread is waiting for the writer lock. /// </para> /// </remarks> @@ -89,7 +89,7 @@ namespace log4net.Util #if HAS_READERWRITERLOCK #if HAS_READERWRITERLOCKSLIM // prevent ThreadAbort while updating state, see https://issues.apache.org/jira/browse/LOG4NET-443 - try { } + try { } finally { m_lock.EnterReadLock(); @@ -107,7 +107,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// <see cref="ReleaseReaderLock"/> decrements the lock count. When the count + /// <see cref="ReleaseReaderLock"/> decrements the lock count. When the count /// reaches zero, the lock is released. /// </para> /// </remarks> @@ -138,7 +138,7 @@ namespace log4net.Util #if HAS_READERWRITERLOCK #if HAS_READERWRITERLOCKSLIM // prevent ThreadAbort while updating state, see https://issues.apache.org/jira/browse/LOG4NET-443 - try { } + try { } finally { m_lock.EnterWriteLock(); @@ -156,7 +156,7 @@ namespace log4net.Util /// </summary> /// <remarks> /// <para> - /// ReleaseWriterLock decrements the writer lock count. + /// ReleaseWriterLock decrements the writer lock count. /// When the count reaches zero, the writer lock is released. /// </para> /// </remarks> http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/8a5b4204/src/Util/ReusableStringWriter.cs ---------------------------------------------------------------------- diff --git a/src/Util/ReusableStringWriter.cs b/src/Util/ReusableStringWriter.cs index 8c1aad1..f5d26c5 100644 --- a/src/Util/ReusableStringWriter.cs +++ b/src/Util/ReusableStringWriter.cs @@ -1,10 +1,10 @@ #region Apache License // -// Licensed to the Apache Software Foundation (ASF) under one or more +// Licensed to the Apache Software Foundation (ASF) under one or more // contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. +// this work for additional information regarding copyright ownership. // The ASF licenses this file to you under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with +// (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 @@ -46,7 +46,7 @@ namespace log4net.Util /// Create an instance of <see cref="ReusableStringWriter"/> /// </para> /// </remarks> - public ReusableStringWriter(IFormatProvider formatProvider) : base(formatProvider) + public ReusableStringWriter(IFormatProvider formatProvider) : base(formatProvider) { } @@ -83,12 +83,12 @@ namespace log4net.Util StringBuilder sb = this.GetStringBuilder(); sb.Length = 0; - + // Check if over max size - if (sb.Capacity > maxCapacity) + if (sb.Capacity > maxCapacity) { sb.Capacity = defaultSize; - } + } } } }
