You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by da...@apache.org on 2020/09/30 06:13:21 UTC
[logging-log4net] branch master updated: :art: sort modifiers with
default .net style sorting
This is an automated email from the ASF dual-hosted git repository.
davydm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git
The following commit(s) were added to refs/heads/master by this push:
new 525526b :art: sort modifiers with default .net style sorting
525526b is described below
commit 525526b982d42db0b97b9e6fe7834da46e0e00e8
Author: Davyd McColl <da...@gmail.com>
AuthorDate: Wed Sep 30 08:13:06 2020 +0200
:art: sort modifiers with default .net style sorting
---
.../LoggerRepository/ConfigurationMessages.cs | 2 +-
src/log4net/Appender/AdoNetAppender.cs | 22 +++---
src/log4net/Appender/AnsiColorTerminalAppender.cs | 6 +-
src/log4net/Appender/AppenderCollection.cs | 4 +-
src/log4net/Appender/AppenderSkeleton.cs | 28 ++++----
src/log4net/Appender/AspNetTraceAppender.cs | 4 +-
src/log4net/Appender/BufferingAppenderSkeleton.cs | 14 ++--
.../Appender/BufferingForwardingAppender.cs | 16 ++---
src/log4net/Appender/ColoredConsoleAppender.cs | 6 +-
src/log4net/Appender/ConsoleAppender.cs | 6 +-
src/log4net/Appender/DebugAppender.cs | 4 +-
src/log4net/Appender/EventLogAppender.cs | 16 ++---
src/log4net/Appender/FileAppender.cs | 24 +++----
src/log4net/Appender/ForwardingAppender.cs | 18 ++---
src/log4net/Appender/LocalSyslogAppender.cs | 4 +-
.../Appender/ManagedColoredConsoleAppender.cs | 6 +-
src/log4net/Appender/MemoryAppender.cs | 12 ++--
src/log4net/Appender/NetSendAppender.cs | 2 +-
src/log4net/Appender/OutputDebugStringAppender.cs | 4 +-
src/log4net/Appender/RemoteSyslogAppender.cs | 2 +-
src/log4net/Appender/RemotingAppender.cs | 6 +-
src/log4net/Appender/RollingFileAppender.cs | 14 ++--
src/log4net/Appender/SmtpAppender.cs | 6 +-
src/log4net/Appender/SmtpPickupDirAppender.cs | 6 +-
src/log4net/Appender/TelnetAppender.cs | 2 +-
src/log4net/Appender/TextWriterAppender.cs | 28 ++++----
src/log4net/Appender/TraceAppender.cs | 4 +-
src/log4net/Appender/UdpAppender.cs | 4 +-
src/log4net/Config/BasicConfigurator.cs | 16 ++---
src/log4net/Config/DOMConfigurator.cs | 20 +++---
src/log4net/Config/PluginAttribute.cs | 2 +-
.../Config/SecurityContextProviderAttribute.cs | 4 +-
src/log4net/Config/XmlConfigurator.cs | 40 +++++------
src/log4net/Config/XmlConfiguratorAttribute.cs | 4 +-
src/log4net/Core/CompactRepositorySelector.cs | 2 +-
src/log4net/Core/DefaultRepositorySelector.cs | 2 +-
src/log4net/Core/Level.cs | 44 ++++++------
src/log4net/Core/LocationInfo.cs | 2 +-
src/log4net/Core/LogImpl.cs | 82 +++++++++++-----------
src/log4net/Core/LoggerManager.cs | 2 +-
src/log4net/Core/LoggerWrapperImpl.cs | 2 +-
src/log4net/Core/LoggingEvent.cs | 2 +-
src/log4net/Core/MethodItem.cs | 2 +-
src/log4net/Core/StackFrameItem.cs | 2 +-
src/log4net/Core/WrapperMap.cs | 6 +-
.../DateFormatter/AbsoluteTimeDateFormatter.cs | 4 +-
src/log4net/DateFormatter/DateTimeDateFormatter.cs | 2 +-
src/log4net/DateFormatter/Iso8601DateFormatter.cs | 2 +-
src/log4net/DateFormatter/SimpleDateFormatter.cs | 2 +-
src/log4net/Filter/DenyAllFilter.cs | 2 +-
src/log4net/Filter/FilterSkeleton.cs | 4 +-
src/log4net/Filter/LevelMatchFilter.cs | 2 +-
src/log4net/Filter/LevelRangeFilter.cs | 2 +-
src/log4net/Filter/LoggerMatchFilter.cs | 2 +-
src/log4net/Filter/PropertyFilter.cs | 2 +-
src/log4net/Filter/StringMatchFilter.cs | 4 +-
src/log4net/GlobalContext.cs | 2 +-
src/log4net/Layout/ExceptionLayout.cs | 4 +-
src/log4net/Layout/Layout2RawLayoutAdapter.cs | 2 +-
src/log4net/Layout/LayoutSkeleton.cs | 12 ++--
.../Layout/Pattern/AppDomainPatternConverter.cs | 2 +-
src/log4net/Layout/Pattern/DatePatternConverter.cs | 4 +-
.../Layout/Pattern/ExceptionPatternConverter.cs | 2 +-
.../Layout/Pattern/FileLocationPatternConverter.cs | 2 +-
.../Layout/Pattern/FullLocationPatternConverter.cs | 2 +-
.../Layout/Pattern/IdentityPatternConverter.cs | 2 +-
.../Layout/Pattern/LevelPatternConverter.cs | 2 +-
.../Layout/Pattern/LineLocationPatternConverter.cs | 2 +-
.../Layout/Pattern/LoggerPatternConverter.cs | 2 +-
.../Layout/Pattern/MessagePatternConverter.cs | 2 +-
.../Pattern/MethodLocationPatternConverter.cs | 2 +-
.../Layout/Pattern/NamedPatternConverter.cs | 6 +-
src/log4net/Layout/Pattern/NdcPatternConverter.cs | 2 +-
.../Layout/Pattern/PatternLayoutConverter.cs | 6 +-
.../Layout/Pattern/PropertyPatternConverter.cs | 2 +-
.../Layout/Pattern/RelativeTimePatternConverter.cs | 2 +-
.../Pattern/StackTraceDetailPatternConverter.cs | 2 +-
.../Layout/Pattern/StackTracePatternConverter.cs | 4 +-
.../Layout/Pattern/ThreadPatternConverter.cs | 2 +-
.../Layout/Pattern/TypeNamePatternConverter.cs | 2 +-
.../Layout/Pattern/UserNamePatternConverter.cs | 2 +-
.../Layout/Pattern/UtcDatePatternConverter.cs | 4 +-
src/log4net/Layout/PatternLayout.cs | 6 +-
src/log4net/Layout/SimpleLayout.cs | 4 +-
src/log4net/Layout/XmlLayout.cs | 4 +-
src/log4net/Layout/XmlLayoutBase.cs | 10 +--
src/log4net/Layout/XmlLayoutSchemaLog4j.cs | 2 +-
src/log4net/LogicalThreadContext.cs | 4 +-
src/log4net/ObjectRenderer/RendererMap.cs | 2 +-
src/log4net/Plugin/RemoteLoggingServerPlugin.cs | 6 +-
src/log4net/Repository/Hierarchy/Hierarchy.cs | 16 ++---
src/log4net/Repository/Hierarchy/Logger.cs | 42 +++++------
src/log4net/Repository/Hierarchy/LoggerKey.cs | 4 +-
src/log4net/Repository/Hierarchy/RootLogger.cs | 6 +-
.../Hierarchy/XmlHierarchyConfigurator.cs | 2 +-
src/log4net/Repository/LoggerRepositorySkeleton.cs | 32 ++++-----
src/log4net/ThreadContext.cs | 4 +-
src/log4net/Util/AppenderAttachedImpl.cs | 2 +-
src/log4net/Util/CountingQuietTextWriter.cs | 2 +-
src/log4net/Util/EmptyCollection.cs | 2 +-
src/log4net/Util/EmptyDictionary.cs | 2 +-
src/log4net/Util/GlobalContextProperties.cs | 2 +-
src/log4net/Util/ILogExtensions.cs | 2 +-
src/log4net/Util/LevelMappingEntry.cs | 2 +-
src/log4net/Util/LogicalThreadContextProperties.cs | 4 +-
src/log4net/Util/LogicalThreadContextStacks.cs | 2 +-
src/log4net/Util/NullDictionaryEnumerator.cs | 2 +-
src/log4net/Util/NullEnumerator.cs | 2 +-
src/log4net/Util/OnlyOnceErrorHandler.cs | 2 +-
src/log4net/Util/OptionConverter.cs | 2 +-
src/log4net/Util/PatternConverter.cs | 4 +-
src/log4net/Util/PatternParser.cs | 2 +-
src/log4net/Util/PatternString.cs | 2 +-
.../AppDomainPatternConverter.cs | 2 +-
.../AppSettingPatternConverter.cs | 2 +-
.../DatePatternConverter.cs | 4 +-
.../EnvironmentFolderPathPatternConverter.cs | 4 +-
.../EnvironmentPatternConverter.cs | 4 +-
.../IdentityPatternConverter.cs | 4 +-
.../LiteralPatternConverter.cs | 4 +-
.../ProcessIdPatternConverter.cs | 4 +-
.../PropertyPatternConverter.cs | 2 +-
.../RandomStringPatternConverter.cs | 4 +-
.../UserNamePatternConverter.cs | 4 +-
.../UtcDatePatternConverter.cs | 4 +-
src/log4net/Util/PropertiesDictionary.cs | 2 +-
src/log4net/Util/ProtectCloseTextWriter.cs | 2 +-
src/log4net/Util/QuietTextWriter.cs | 4 +-
src/log4net/Util/SystemInfo.cs | 2 +-
src/log4net/Util/SystemStringFormat.cs | 2 +-
src/log4net/Util/TextWriterAdapter.cs | 16 ++---
src/log4net/Util/ThreadContextProperties.cs | 2 +-
src/log4net/Util/ThreadContextStacks.cs | 2 +-
.../Util/TypeConverters/ConverterRegistry.cs | 2 +-
src/log4net/Util/WindowsSecurityContext.cs | 4 +-
135 files changed, 435 insertions(+), 435 deletions(-)
diff --git a/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs b/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs
index e9a8877..daa2672 100644
--- a/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs
+++ b/src/log4net.Tests/LoggerRepository/ConfigurationMessages.cs
@@ -80,7 +80,7 @@ namespace log4net.Tests.LoggerRepository
public class LogLogAppender : AppenderSkeleton
{
- private readonly static Type declaringType = typeof(LogLogAppender);
+ private static readonly Type declaringType = typeof(LogLogAppender);
public override void ActivateOptions()
{
diff --git a/src/log4net/Appender/AdoNetAppender.cs b/src/log4net/Appender/AdoNetAppender.cs
index 72a5a76..dd9939b 100644
--- a/src/log4net/Appender/AdoNetAppender.cs
+++ b/src/log4net/Appender/AdoNetAppender.cs
@@ -407,7 +407,7 @@ namespace log4net.Appender
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -431,7 +431,7 @@ namespace log4net.Appender
/// Closes the database command and database connection.
/// </para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
base.OnClose();
DiposeConnection();
@@ -451,7 +451,7 @@ namespace log4net.Appender
/// array into the database.
/// </para>
/// </remarks>
- override protected void SendBuffer(LoggingEvent[] events)
+ protected override void SendBuffer(LoggingEvent[] events)
{
if (ReconnectOnError && (Connection == null || Connection.State != ConnectionState.Open))
{
@@ -536,7 +536,7 @@ namespace log4net.Appender
/// property for more information.
/// </para>
/// </remarks>
- virtual protected void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events)
+ protected virtual void SendBuffer(IDbTransaction dbTran, LoggingEvent[] events)
{
// string.IsNotNullOrWhiteSpace() does not exist in ancient .NET frameworks
if (CommandText != null && CommandText.Trim() != "")
@@ -608,7 +608,7 @@ namespace log4net.Appender
/// <returns>
/// Text that can be passed to a <see cref="System.Data.IDbCommand"/>.
/// </returns>
- virtual protected string GetLogStatement(LoggingEvent logEvent)
+ protected virtual string GetLogStatement(LoggingEvent logEvent)
{
if (Layout == null)
{
@@ -632,7 +632,7 @@ namespace log4net.Appender
/// <param name="connectionType">The <see cref="Type"/> of the <see cref="IDbConnection"/> object.</param>
/// <param name="connectionString">The connectionString output from the ResolveConnectionString method.</param>
/// <returns>An <see cref="IDbConnection"/> instance with a valid connection string.</returns>
- virtual protected IDbConnection CreateConnection(Type connectionType, string connectionString)
+ protected virtual IDbConnection CreateConnection(Type connectionType, string connectionString)
{
IDbConnection connection = (IDbConnection)Activator.CreateInstance(connectionType);
connection.ConnectionString = connectionString;
@@ -648,7 +648,7 @@ namespace log4net.Appender
/// </remarks>
/// <param name="connectionStringContext">Additional information describing the connection string.</param>
/// <returns>A connection string used to connect to the database.</returns>
- virtual protected string ResolveConnectionString(out string connectionStringContext)
+ protected virtual string ResolveConnectionString(out string connectionStringContext)
{
if (ConnectionString != null && ConnectionString.Length > 0)
{
@@ -702,7 +702,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
/// <returns>The <see cref="Type"/> of the ADO.NET provider</returns>
- virtual protected Type ResolveConnectionType()
+ protected virtual Type ResolveConnectionType()
{
try
{
@@ -858,7 +858,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(AdoNetAppender);
+ private static readonly Type declaringType = typeof(AdoNetAppender);
#endregion Private Static Fields
}
@@ -1053,7 +1053,7 @@ namespace log4net.Appender
/// this parameter to its collection of parameters.
/// </para>
/// </remarks>
- virtual public void Prepare(IDbCommand command)
+ public virtual void Prepare(IDbCommand command)
{
// Create a new parameter
IDbDataParameter param = command.CreateParameter();
@@ -1093,7 +1093,7 @@ namespace log4net.Appender
/// object. Sets the value of the parameter on the command object.
/// </para>
/// </remarks>
- virtual public void FormatValue(IDbCommand command, LoggingEvent loggingEvent)
+ public virtual void FormatValue(IDbCommand command, LoggingEvent loggingEvent)
{
// Lookup the parameter
IDbDataParameter param = (IDbDataParameter)command.Parameters[ParameterName];
diff --git a/src/log4net/Appender/AnsiColorTerminalAppender.cs b/src/log4net/Appender/AnsiColorTerminalAppender.cs
index 2f07476..50a6875 100644
--- a/src/log4net/Appender/AnsiColorTerminalAppender.cs
+++ b/src/log4net/Appender/AnsiColorTerminalAppender.cs
@@ -246,7 +246,7 @@ namespace log4net.Appender
/// This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
/// </para>
/// </remarks>
- virtual public string Target
+ public virtual string Target
{
get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; }
set
@@ -296,7 +296,7 @@ namespace log4net.Appender
/// The format of the output will depend on the appender's layout.
/// </para>
/// </remarks>
- override protected void Append(log4net.Core.LoggingEvent loggingEvent)
+ protected override void Append(log4net.Core.LoggingEvent loggingEvent)
{
string loggingMessage = RenderLoggingEvent(loggingEvent);
@@ -366,7 +366,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/AppenderCollection.cs b/src/log4net/Appender/AppenderCollection.cs
index 21987b8..14f2304 100644
--- a/src/log4net/Appender/AppenderCollection.cs
+++ b/src/log4net/Appender/AppenderCollection.cs
@@ -160,7 +160,7 @@ namespace log4net.Appender
/// Used to access protected constructor
/// </summary>
/// <exclude/>
- internal protected enum Tag
+ protected internal enum Tag
{
/// <summary>
/// A value
@@ -173,7 +173,7 @@ namespace log4net.Appender
/// </summary>
/// <param name="tag"></param>
/// <exclude/>
- internal protected AppenderCollection(Tag tag)
+ protected internal AppenderCollection(Tag tag)
{
m_array = null;
}
diff --git a/src/log4net/Appender/AppenderSkeleton.cs b/src/log4net/Appender/AppenderSkeleton.cs
index 44fb690..44b68c7 100644
--- a/src/log4net/Appender/AppenderSkeleton.cs
+++ b/src/log4net/Appender/AppenderSkeleton.cs
@@ -121,7 +121,7 @@ namespace log4net.Appender
/// implementation for the <see cref="ErrorHandler"/> property.
/// </para>
/// </remarks>
- virtual public IErrorHandler ErrorHandler
+ public virtual IErrorHandler ErrorHandler
{
get { return this.m_errorHandler; }
set
@@ -152,7 +152,7 @@ namespace log4net.Appender
/// and so all Filters on this Appender are available through the result.
/// </para>
/// </remarks>
- virtual public IFilter FilterHead
+ public virtual IFilter FilterHead
{
get { return m_headFilter; }
}
@@ -167,7 +167,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
/// <seealso cref="RequiresLayout"/>
- virtual public ILayout Layout
+ public virtual ILayout Layout
{
get { return m_layout; }
set { m_layout = value; }
@@ -193,7 +193,7 @@ namespace log4net.Appender
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- virtual public void ActivateOptions()
+ public virtual void ActivateOptions()
{
}
@@ -479,7 +479,7 @@ namespace log4net.Appender
/// </list>
/// </para>
/// </remarks>
- virtual protected bool FilterEvent(LoggingEvent loggingEvent)
+ protected virtual bool FilterEvent(LoggingEvent loggingEvent)
{
if (!IsAsSevereAsThreshold(loggingEvent.Level))
{
@@ -523,7 +523,7 @@ namespace log4net.Appender
/// back of the filter chain.
/// </para>
/// </remarks>
- virtual public void AddFilter(IFilter filter)
+ public virtual void AddFilter(IFilter filter)
{
if (filter == null)
{
@@ -549,7 +549,7 @@ namespace log4net.Appender
/// Clears the filter list for this appender.
/// </para>
/// </remarks>
- virtual public void ClearFilters()
+ public virtual void ClearFilters()
{
m_headFilter = m_tailFilter = null;
}
@@ -571,7 +571,7 @@ namespace log4net.Appender
/// <c>true</c> if the <paramref name="level"/> meets the <see cref="Threshold"/>
/// requirements of this appender.
/// </returns>
- virtual protected bool IsAsSevereAsThreshold(Level level)
+ protected virtual bool IsAsSevereAsThreshold(Level level)
{
return ((m_threshold == null) || level >= m_threshold);
}
@@ -589,7 +589,7 @@ namespace log4net.Appender
/// It is a programming error to append to a closed appender.
/// </para>
/// </remarks>
- virtual protected void OnClose()
+ protected virtual void OnClose()
{
// Do nothing by default
}
@@ -612,7 +612,7 @@ namespace log4net.Appender
/// override the <see cref="M:PreAppendCheck()"/> method.
/// </para>
/// </remarks>
- abstract protected void Append(LoggingEvent loggingEvent);
+ protected abstract void Append(LoggingEvent loggingEvent);
/// <summary>
/// Append a bulk array of logging events.
@@ -628,7 +628,7 @@ namespace log4net.Appender
/// override this method in addition to <see cref="M:Append(LoggingEvent)"/>.
/// </para>
/// </remarks>
- virtual protected void Append(LoggingEvent[] loggingEvents)
+ protected virtual void Append(LoggingEvent[] loggingEvents)
{
foreach(LoggingEvent loggingEvent in loggingEvents)
{
@@ -654,7 +654,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
/// <returns><c>true</c> if the call to <see cref="M:Append(LoggingEvent)"/> should proceed.</returns>
- virtual protected bool PreAppendCheck()
+ protected virtual bool PreAppendCheck()
{
if ((m_layout == null) && RequiresLayout)
{
@@ -775,7 +775,7 @@ namespace log4net.Appender
/// <returns>
/// <c>true</c> if the appender requires a layout object, otherwise <c>false</c>.
/// </returns>
- virtual protected bool RequiresLayout
+ protected virtual bool RequiresLayout
{
get { return false; }
}
@@ -902,7 +902,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(AppenderSkeleton);
+ private static readonly Type declaringType = typeof(AppenderSkeleton);
#endregion Private Static Fields
}
diff --git a/src/log4net/Appender/AspNetTraceAppender.cs b/src/log4net/Appender/AspNetTraceAppender.cs
index a8e3f52..bffa045 100644
--- a/src/log4net/Appender/AspNetTraceAppender.cs
+++ b/src/log4net/Appender/AspNetTraceAppender.cs
@@ -85,7 +85,7 @@ namespace log4net.Appender
/// (<see cref="TraceContext"/>).
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
// check if log4net is running in the context of an ASP.NET application
if (HttpContext.Current != null)
@@ -114,7 +114,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/BufferingAppenderSkeleton.cs b/src/log4net/Appender/BufferingAppenderSkeleton.cs
index 91b49f4..c49d838 100644
--- a/src/log4net/Appender/BufferingAppenderSkeleton.cs
+++ b/src/log4net/Appender/BufferingAppenderSkeleton.cs
@@ -222,7 +222,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
[Obsolete("Use Fix property")]
- virtual public bool OnlyFixPartialEventData
+ public virtual bool OnlyFixPartialEventData
{
get { return (Fix == FixFlags.Partial); }
set
@@ -252,7 +252,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
/// <seealso cref="LoggingEvent.Fix"/>
- virtual public FixFlags Fix
+ public virtual FixFlags Fix
{
get { return m_fixFlags; }
set { m_fixFlags = value; }
@@ -381,7 +381,7 @@ namespace log4net.Appender
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -417,7 +417,7 @@ namespace log4net.Appender
/// the buffer must be sent when the appender is closed.
/// </para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
// Flush the buffer on close
Flush(true);
@@ -453,7 +453,7 @@ namespace log4net.Appender
/// is processed.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
// If the buffer size is set to 1 or less then the buffer will be
// sent immediately because there is not enough space in the buffer
@@ -542,7 +542,7 @@ namespace log4net.Appender
/// The subclass must override <see cref="M:SendBuffer(LoggingEvent[])"/>.
/// </para>
/// </remarks>
- virtual protected void SendFromBuffer(LoggingEvent firstLoggingEvent, CyclicBuffer buffer)
+ protected virtual void SendFromBuffer(LoggingEvent firstLoggingEvent, CyclicBuffer buffer)
{
LoggingEvent[] bufferEvents = buffer.PopAll();
@@ -576,7 +576,7 @@ namespace log4net.Appender
/// The subclass must override this method to process the buffered events.
/// </para>
/// </remarks>
- abstract protected void SendBuffer(LoggingEvent[] events);
+ protected abstract void SendBuffer(LoggingEvent[] events);
#region Private Static Fields
diff --git a/src/log4net/Appender/BufferingForwardingAppender.cs b/src/log4net/Appender/BufferingForwardingAppender.cs
index 17d02b8..20c3624 100644
--- a/src/log4net/Appender/BufferingForwardingAppender.cs
+++ b/src/log4net/Appender/BufferingForwardingAppender.cs
@@ -74,7 +74,7 @@ namespace log4net.Appender
/// It is a programming error to append to a closed appender.
/// </para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
// Remove all the attached appenders
lock(this)
@@ -102,7 +102,7 @@ namespace log4net.Appender
/// Forwards the events to the attached appenders.
/// </para>
/// </remarks>
- override protected void SendBuffer(LoggingEvent[] events)
+ protected override void SendBuffer(LoggingEvent[] events)
{
// Pass the logging event on to the attached appenders
if (m_appenderAttachedImpl != null)
@@ -126,7 +126,7 @@ namespace log4net.Appender
/// appenders, then it won't be added again.
/// </para>
/// </remarks>
- virtual public void AddAppender(IAppender newAppender)
+ public virtual void AddAppender(IAppender newAppender)
{
if (newAppender == null)
{
@@ -153,7 +153,7 @@ namespace log4net.Appender
/// <returns>
/// A collection of the appenders in this appender.
/// </returns>
- virtual public AppenderCollection Appenders
+ public virtual AppenderCollection Appenders
{
get
{
@@ -183,7 +183,7 @@ namespace log4net.Appender
/// Get the named appender attached to this buffering appender.
/// </para>
/// </remarks>
- virtual public IAppender GetAppender(string name)
+ public virtual IAppender GetAppender(string name)
{
lock(this)
{
@@ -204,7 +204,7 @@ namespace log4net.Appender
/// This is useful when re-reading configuration information.
/// </para>
/// </remarks>
- virtual public void RemoveAllAppenders()
+ public virtual void RemoveAllAppenders()
{
lock(this)
{
@@ -226,7 +226,7 @@ namespace log4net.Appender
/// If you are discarding the appender you must call
/// <see cref="IAppender.Close"/> on the appender removed.
/// </remarks>
- virtual public IAppender RemoveAppender(IAppender appender)
+ public virtual IAppender RemoveAppender(IAppender appender)
{
lock(this)
{
@@ -248,7 +248,7 @@ namespace log4net.Appender
/// If you are discarding the appender you must call
/// <see cref="IAppender.Close"/> on the appender removed.
/// </remarks>
- virtual public IAppender RemoveAppender(string name)
+ public virtual IAppender RemoveAppender(string name)
{
lock(this)
{
diff --git a/src/log4net/Appender/ColoredConsoleAppender.cs b/src/log4net/Appender/ColoredConsoleAppender.cs
index d394970..cbcc875 100644
--- a/src/log4net/Appender/ColoredConsoleAppender.cs
+++ b/src/log4net/Appender/ColoredConsoleAppender.cs
@@ -216,7 +216,7 @@ namespace log4net.Appender
/// This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
/// </para>
/// </remarks>
- virtual public string Target
+ public virtual string Target
{
get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; }
set
@@ -270,7 +270,7 @@ namespace log4net.Appender
[System.Security.SecuritySafeCritical]
#endif
[System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)]
- override protected void Append(log4net.Core.LoggingEvent loggingEvent)
+ protected override void Append(log4net.Core.LoggingEvent loggingEvent)
{
if (m_consoleOutputWriter != null)
{
@@ -422,7 +422,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/ConsoleAppender.cs b/src/log4net/Appender/ConsoleAppender.cs
index d5d6a70..760aace 100644
--- a/src/log4net/Appender/ConsoleAppender.cs
+++ b/src/log4net/Appender/ConsoleAppender.cs
@@ -115,7 +115,7 @@ namespace log4net.Appender
/// This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
/// </para>
/// </remarks>
- virtual public string Target
+ public virtual string Target
{
get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; }
set
@@ -149,7 +149,7 @@ namespace log4net.Appender
/// The format of the output will depend on the appender's layout.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
#if NETCF_1_0
// Write to the output stream
@@ -177,7 +177,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/DebugAppender.cs b/src/log4net/Appender/DebugAppender.cs
index b4f3295..c1eda99 100644
--- a/src/log4net/Appender/DebugAppender.cs
+++ b/src/log4net/Appender/DebugAppender.cs
@@ -164,7 +164,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
#endif
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
//
// Write the string to the Debug system
@@ -205,7 +205,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/EventLogAppender.cs b/src/log4net/Appender/EventLogAppender.cs
index 0784cbf..0d1f3c8 100644
--- a/src/log4net/Appender/EventLogAppender.cs
+++ b/src/log4net/Appender/EventLogAppender.cs
@@ -275,7 +275,7 @@ namespace log4net.Appender
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
try
{
@@ -381,7 +381,7 @@ namespace log4net.Appender
/// There is a limit of 32K characters for an event log message
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
//
// Write the resulting string to the event log system
@@ -484,7 +484,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
@@ -504,7 +504,7 @@ namespace log4net.Appender
/// <see cref="Level"/> this is a one way mapping. There is
/// a loss of information during the conversion.
/// </remarks>
- virtual protected EventLogEntryType GetEntryType(Level level)
+ protected virtual EventLogEntryType GetEntryType(Level level)
{
// see if there is a specified lookup.
Level2EventLogEntryType entryType = m_levelMapping.Lookup(level) as Level2EventLogEntryType;
@@ -614,7 +614,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(EventLogAppender);
+ private static readonly Type declaringType = typeof(EventLogAppender);
/// <summary>
/// The maximum size supported by default.
@@ -628,7 +628,7 @@ namespace log4net.Appender
/// the event log! See: System.Diagnostics.EventLogInternal.InternalWriteEvent()
/// for the use of the 32766 max size.
/// </remarks>
- private readonly static int MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT = 32766;
+ private static readonly int MAX_EVENTLOG_MESSAGE_SIZE_DEFAULT = 32766;
/// <summary>
/// The maximum size supported by a windows operating system that is vista
@@ -659,7 +659,7 @@ namespace log4net.Appender
/// terminator of #0#0, as we cannot see the source of ReportEvent (though we could use an API monitor to examine the
/// buffer, given enough time).
/// </remarks>
- private readonly static int MAX_EVENTLOG_MESSAGE_SIZE_VISTA_OR_NEWER = 31839 - 2;
+ private static readonly int MAX_EVENTLOG_MESSAGE_SIZE_VISTA_OR_NEWER = 31839 - 2;
/// <summary>
/// The maximum size that the operating system supports for
@@ -670,7 +670,7 @@ namespace log4net.Appender
/// to the operating system event log and eventually truncate a string
/// that exceeds the limits.
/// </remarks>
- private readonly static int MAX_EVENTLOG_MESSAGE_SIZE = GetMaxEventLogMessageSize();
+ private static readonly int MAX_EVENTLOG_MESSAGE_SIZE = GetMaxEventLogMessageSize();
/// <summary>
/// This method determines the maximum event log message size allowed for
diff --git a/src/log4net/Appender/FileAppender.cs b/src/log4net/Appender/FileAppender.cs
index f0c2bc1..dbade37 100644
--- a/src/log4net/Appender/FileAppender.cs
+++ b/src/log4net/Appender/FileAppender.cs
@@ -965,7 +965,7 @@ namespace log4net.Appender
/// the application base directory.
/// </para>
/// </remarks>
- virtual public string File
+ public virtual string File
{
get { return m_fileName; }
set { m_fileName = value; }
@@ -1101,7 +1101,7 @@ namespace log4net.Appender
/// This will cause the file to be opened.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -1145,7 +1145,7 @@ namespace log4net.Appender
/// Resets the filename and the file stream.
/// </para>
/// </remarks>
- override protected void Reset()
+ protected override void Reset()
{
base.Reset();
m_fileName = null;
@@ -1154,7 +1154,7 @@ namespace log4net.Appender
/// <summary>
/// Close this appender instance. The underlying stream or writer is also closed.
/// </summary>
- override protected void OnClose()
+ protected override void OnClose()
{
base.OnClose();
m_lockingModel.OnClose();
@@ -1169,7 +1169,7 @@ namespace log4net.Appender
/// successfully opened.
/// </para>
/// </remarks>
- override protected void PrepareWriter()
+ protected override void PrepareWriter()
{
SafeOpenFile(m_fileName, m_appendToFile);
}
@@ -1188,7 +1188,7 @@ namespace log4net.Appender
/// The format of the output will depend on the appender's layout.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
if (m_stream.AcquireLock())
{
@@ -1214,7 +1214,7 @@ namespace log4net.Appender
/// the stream.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent[] loggingEvents)
+ protected override void Append(LoggingEvent[] loggingEvents)
{
if (m_stream.AcquireLock())
{
@@ -1337,7 +1337,7 @@ namespace log4net.Appender
/// Errors are passed to the <see cref="TextWriterAppender.ErrorHandler"/>.
/// </para>
/// </remarks>
- virtual protected void SafeOpenFile(string fileName, bool append)
+ protected virtual void SafeOpenFile(string fileName, bool append)
{
try
{
@@ -1364,7 +1364,7 @@ namespace log4net.Appender
/// for the <paramref name="fileName"/> specified exists.
/// </para>
/// </remarks>
- virtual protected void OpenFile(string fileName, bool append)
+ protected virtual void OpenFile(string fileName, bool append)
{
if (LogLog.IsErrorEnabled)
{
@@ -1427,7 +1427,7 @@ namespace log4net.Appender
/// data using a <c>System.Security.Cryptography.CryptoStream</c>.
/// </para>
/// </remarks>
- virtual protected void SetQWForFiles(Stream fileStream)
+ protected virtual void SetQWForFiles(Stream fileStream)
{
#pragma warning disable CA2000 // Dispose objects before losing scope
StreamWriter writer = new StreamWriter(fileStream, m_encoding);
@@ -1445,7 +1445,7 @@ namespace log4net.Appender
/// wrap the <see cref="TextWriter"/> in some way.
/// </para>
/// </remarks>
- virtual protected void SetQWForFiles(TextWriter writer)
+ protected virtual void SetQWForFiles(TextWriter writer)
{
QuietWriter = new QuietTextWriter(writer, ErrorHandler);
}
@@ -1518,7 +1518,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(FileAppender);
+ private static readonly Type declaringType = typeof(FileAppender);
#endregion Private Static Fields
}
diff --git a/src/log4net/Appender/ForwardingAppender.cs b/src/log4net/Appender/ForwardingAppender.cs
index 681f812..20a99cc 100644
--- a/src/log4net/Appender/ForwardingAppender.cs
+++ b/src/log4net/Appender/ForwardingAppender.cs
@@ -68,7 +68,7 @@ namespace log4net.Appender
/// It is a programming error to append to a closed appender.
/// </para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
// Remove all the attached appenders
lock(this)
@@ -89,7 +89,7 @@ namespace log4net.Appender
/// Delivers the logging event to all the attached appenders.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
// Pass the logging event on the the attached appenders
if (m_appenderAttachedImpl != null)
@@ -107,7 +107,7 @@ namespace log4net.Appender
/// Delivers the logging events to all the attached appenders.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent[] loggingEvents)
+ protected override void Append(LoggingEvent[] loggingEvents)
{
// Pass the logging event on the the attached appenders
if (m_appenderAttachedImpl != null)
@@ -131,7 +131,7 @@ namespace log4net.Appender
/// appenders, then it won't be added again.
/// </para>
/// </remarks>
- virtual public void AddAppender(IAppender newAppender)
+ public virtual void AddAppender(IAppender newAppender)
{
if (newAppender == null)
{
@@ -158,7 +158,7 @@ namespace log4net.Appender
/// <returns>
/// A collection of the appenders in this appender.
/// </returns>
- virtual public AppenderCollection Appenders
+ public virtual AppenderCollection Appenders
{
get
{
@@ -188,7 +188,7 @@ namespace log4net.Appender
/// Get the named appender attached to this appender.
/// </para>
/// </remarks>
- virtual public IAppender GetAppender(string name)
+ public virtual IAppender GetAppender(string name)
{
lock(this)
{
@@ -209,7 +209,7 @@ namespace log4net.Appender
/// This is useful when re-reading configuration information.
/// </para>
/// </remarks>
- virtual public void RemoveAllAppenders()
+ public virtual void RemoveAllAppenders()
{
lock(this)
{
@@ -231,7 +231,7 @@ namespace log4net.Appender
/// If you are discarding the appender you must call
/// <see cref="IAppender.Close"/> on the appender removed.
/// </remarks>
- virtual public IAppender RemoveAppender(IAppender appender)
+ public virtual IAppender RemoveAppender(IAppender appender)
{
lock(this)
{
@@ -253,7 +253,7 @@ namespace log4net.Appender
/// If you are discarding the appender you must call
/// <see cref="IAppender.Close"/> on the appender removed.
/// </remarks>
- virtual public IAppender RemoveAppender(string name)
+ public virtual IAppender RemoveAppender(string name)
{
lock(this)
{
diff --git a/src/log4net/Appender/LocalSyslogAppender.cs b/src/log4net/Appender/LocalSyslogAppender.cs
index 13efc54..ad31b5d 100644
--- a/src/log4net/Appender/LocalSyslogAppender.cs
+++ b/src/log4net/Appender/LocalSyslogAppender.cs
@@ -433,7 +433,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="AppenderSkeleton.Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
@@ -452,7 +452,7 @@ namespace log4net.Appender
/// Translates a log4net level to a syslog severity.
/// </para>
/// </remarks>
- virtual protected SyslogSeverity GetSeverity(Level level)
+ protected virtual SyslogSeverity GetSeverity(Level level)
{
LevelSeverity levelSeverity = m_levelMapping.Lookup(level) as LevelSeverity;
if (levelSeverity != null)
diff --git a/src/log4net/Appender/ManagedColoredConsoleAppender.cs b/src/log4net/Appender/ManagedColoredConsoleAppender.cs
index 9efe65d..9edfce5 100644
--- a/src/log4net/Appender/ManagedColoredConsoleAppender.cs
+++ b/src/log4net/Appender/ManagedColoredConsoleAppender.cs
@@ -126,7 +126,7 @@ namespace log4net.Appender
/// This is either <c>"Console.Out"</c> or <c>"Console.Error"</c>.
/// </para>
/// </remarks>
- virtual public string Target
+ public virtual string Target
{
get { return m_writeToErrorStream ? ConsoleError : ConsoleOut; }
set
@@ -174,7 +174,7 @@ namespace log4net.Appender
/// The format of the output will depend on the appender's layout.
/// </para>
/// </remarks>
- override protected void Append(log4net.Core.LoggingEvent loggingEvent)
+ protected override void Append(log4net.Core.LoggingEvent loggingEvent)
{
System.IO.TextWriter writer;
@@ -216,7 +216,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/MemoryAppender.cs b/src/log4net/Appender/MemoryAppender.cs
index e0ec741..441569c 100644
--- a/src/log4net/Appender/MemoryAppender.cs
+++ b/src/log4net/Appender/MemoryAppender.cs
@@ -84,7 +84,7 @@ namespace log4net.Appender
/// Gets the events that have been logged.
/// </para>
/// </remarks>
- virtual public LoggingEvent[] GetEvents()
+ public virtual LoggingEvent[] GetEvents()
{
lock (m_eventsList.SyncRoot)
{
@@ -110,7 +110,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
[Obsolete("Use Fix property")]
- virtual public bool OnlyFixPartialEventData
+ public virtual bool OnlyFixPartialEventData
{
get { return (Fix == FixFlags.Partial); }
set
@@ -136,7 +136,7 @@ namespace log4net.Appender
/// for details.
/// </para>
/// </remarks>
- virtual public FixFlags Fix
+ public virtual FixFlags Fix
{
get { return m_fixFlags; }
set { m_fixFlags = value; }
@@ -153,7 +153,7 @@ namespace log4net.Appender
/// <remarks>
/// <para>Stores the <paramref name="loggingEvent"/> in the events list.</para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
// Because we are caching the LoggingEvent beyond the
// lifetime of the Append() method we must fix any
@@ -176,7 +176,7 @@ namespace log4net.Appender
/// <remarks>
/// Clear the list of events
/// </remarks>
- virtual public void Clear()
+ public virtual void Clear()
{
lock (m_eventsList.SyncRoot)
{
@@ -193,7 +193,7 @@ namespace log4net.Appender
/// Gets the events that have been logged and clears the list of events.
/// </para>
/// </remarks>
- virtual public LoggingEvent[] PopAllEvents()
+ public virtual LoggingEvent[] PopAllEvents()
{
lock (m_eventsList.SyncRoot)
{
diff --git a/src/log4net/Appender/NetSendAppender.cs b/src/log4net/Appender/NetSendAppender.cs
index a72076f..b03d21d 100644
--- a/src/log4net/Appender/NetSendAppender.cs
+++ b/src/log4net/Appender/NetSendAppender.cs
@@ -344,7 +344,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/OutputDebugStringAppender.cs b/src/log4net/Appender/OutputDebugStringAppender.cs
index f010fd5..1a13512 100644
--- a/src/log4net/Appender/OutputDebugStringAppender.cs
+++ b/src/log4net/Appender/OutputDebugStringAppender.cs
@@ -80,7 +80,7 @@ namespace log4net.Appender
#if !NETCF && !NETSTANDARD1_3
[System.Security.Permissions.SecurityPermission(System.Security.Permissions.SecurityAction.Demand, UnmanagedCode = true)]
#endif
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
#if NETSTANDARD
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -101,7 +101,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/RemoteSyslogAppender.cs b/src/log4net/Appender/RemoteSyslogAppender.cs
index a70bb56..675d6f9 100644
--- a/src/log4net/Appender/RemoteSyslogAppender.cs
+++ b/src/log4net/Appender/RemoteSyslogAppender.cs
@@ -456,7 +456,7 @@ namespace log4net.Appender
/// Translates a log4net level to a syslog severity.
/// </para>
/// </remarks>
- virtual protected SyslogSeverity GetSeverity(Level level)
+ protected virtual SyslogSeverity GetSeverity(Level level)
{
LevelSeverity levelSeverity = m_levelMapping.Lookup(level) as LevelSeverity;
if (levelSeverity != null)
diff --git a/src/log4net/Appender/RemotingAppender.cs b/src/log4net/Appender/RemotingAppender.cs
index f4fa6f1..7c095f8 100644
--- a/src/log4net/Appender/RemotingAppender.cs
+++ b/src/log4net/Appender/RemotingAppender.cs
@@ -141,7 +141,7 @@ namespace log4net.Appender
#if NET_4_0 || MONO_4_0
[System.Security.SecuritySafeCritical]
#endif
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -173,7 +173,7 @@ namespace log4net.Appender
/// the events will block in the thread pool manager until a thread is available.
/// </remarks>
/// <param name="events">The events to send.</param>
- override protected void SendBuffer(LoggingEvent[] events)
+ protected override void SendBuffer(LoggingEvent[] events)
{
// Setup for an async send
BeginAsyncSend();
@@ -207,7 +207,7 @@ namespace log4net.Appender
/// exit the runtime limits the time that a <see cref="AppDomain.ProcessExit"/>
/// event handler is allowed to run for.</para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
base.OnClose();
diff --git a/src/log4net/Appender/RollingFileAppender.cs b/src/log4net/Appender/RollingFileAppender.cs
index 9da3fb8..b5bf253 100644
--- a/src/log4net/Appender/RollingFileAppender.cs
+++ b/src/log4net/Appender/RollingFileAppender.cs
@@ -547,7 +547,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(RollingFileAppender);
+ private static readonly Type declaringType = typeof(RollingFileAppender);
#endregion Private Static Fields
@@ -560,7 +560,7 @@ namespace log4net.Appender
/// This method can be overridden by sub classes.
/// </remarks>
/// <param name="writer">the writer to set</param>
- override protected void SetQWForFiles(TextWriter writer)
+ protected override void SetQWForFiles(TextWriter writer)
{
QuietWriter = new CountingQuietTextWriter(writer, ErrorHandler);
}
@@ -576,7 +576,7 @@ namespace log4net.Appender
/// is need and then appends to the file last.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
AdjustFileBeforeAppend();
base.Append(loggingEvent);
@@ -593,7 +593,7 @@ namespace log4net.Appender
/// is need and then appends to the file last.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent[] loggingEvents)
+ protected override void Append(LoggingEvent[] loggingEvents)
{
AdjustFileBeforeAppend();
base.Append(loggingEvents);
@@ -609,7 +609,7 @@ namespace log4net.Appender
/// is need and then appends to the file last.
/// </para>
/// </remarks>
- virtual protected void AdjustFileBeforeAppend()
+ protected virtual void AdjustFileBeforeAppend()
{
// reuse the file appenders locking model to lock the rolling
#if !NETCF
@@ -663,7 +663,7 @@ namespace log4net.Appender
/// <para>This method will ensure that the directory structure
/// for the <paramref name="fileName"/> specified exists.</para>
/// </remarks>
- override protected void OpenFile(string fileName, bool append)
+ protected override void OpenFile(string fileName, bool append)
{
lock(this)
{
@@ -1114,7 +1114,7 @@ namespace log4net.Appender
/// the current number of backups.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
if (m_dateTime == null)
{
diff --git a/src/log4net/Appender/SmtpAppender.cs b/src/log4net/Appender/SmtpAppender.cs
index bbe8bd5..98b6bb6 100644
--- a/src/log4net/Appender/SmtpAppender.cs
+++ b/src/log4net/Appender/SmtpAppender.cs
@@ -381,7 +381,7 @@ namespace log4net.Appender
/// Sends the contents of the cyclic buffer as an e-mail message.
/// </summary>
/// <param name="events">The logging events to send.</param>
- override protected void SendBuffer(LoggingEvent[] events)
+ protected override void SendBuffer(LoggingEvent[] events)
{
// Note: this code already owns the monitor for this
// appender. This frees us from needing to synchronize again.
@@ -428,7 +428,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
@@ -441,7 +441,7 @@ namespace log4net.Appender
/// Send the email message
/// </summary>
/// <param name="messageBody">the body text to include in the mail</param>
- virtual protected void SendEmail(string messageBody)
+ protected virtual void SendEmail(string messageBody)
{
#if NET_2_0 || MONO_2_0 || NETSTANDARD2_0
// .NET 2.0 has a new API for SMTP email System.Net.Mail
diff --git a/src/log4net/Appender/SmtpPickupDirAppender.cs b/src/log4net/Appender/SmtpPickupDirAppender.cs
index b9a97ef..17a6af4 100644
--- a/src/log4net/Appender/SmtpPickupDirAppender.cs
+++ b/src/log4net/Appender/SmtpPickupDirAppender.cs
@@ -201,7 +201,7 @@ namespace log4net.Appender
/// Sends the contents of the cyclic buffer as an e-mail message.
/// </para>
/// </remarks>
- override protected void SendBuffer(LoggingEvent[] events)
+ protected override void SendBuffer(LoggingEvent[] events)
{
// Note: this code already owns the monitor for this
// appender. This frees us from needing to synchronize again.
@@ -280,7 +280,7 @@ namespace log4net.Appender
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -304,7 +304,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/TelnetAppender.cs b/src/log4net/Appender/TelnetAppender.cs
index b117ca0..0d61a00 100644
--- a/src/log4net/Appender/TelnetAppender.cs
+++ b/src/log4net/Appender/TelnetAppender.cs
@@ -79,7 +79,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(TelnetAppender);
+ private static readonly Type declaringType = typeof(TelnetAppender);
#endregion Private Static Fields
diff --git a/src/log4net/Appender/TextWriterAppender.cs b/src/log4net/Appender/TextWriterAppender.cs
index 9482607..6eb943c 100644
--- a/src/log4net/Appender/TextWriterAppender.cs
+++ b/src/log4net/Appender/TextWriterAppender.cs
@@ -144,7 +144,7 @@ namespace log4net.Appender
/// <b>Note:</b> Logging to an unopened <see cref="TextWriter"/> will fail.
/// </para>
/// </remarks>
- virtual public TextWriter Writer
+ public virtual TextWriter Writer
{
get { return m_qtw; }
set
@@ -175,7 +175,7 @@ namespace log4net.Appender
/// </para>
/// </remarks>
/// <returns><c>false</c> if any of the preconditions fail.</returns>
- override protected bool PreAppendCheck()
+ protected override bool PreAppendCheck()
{
if (!base.PreAppendCheck())
{
@@ -216,7 +216,7 @@ namespace log4net.Appender
/// The format of the output will depend on the appender's layout.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
RenderLoggingEvent(m_qtw, loggingEvent);
@@ -237,7 +237,7 @@ namespace log4net.Appender
/// before flushing the stream.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent[] loggingEvents)
+ protected override void Append(LoggingEvent[] loggingEvents)
{
foreach(LoggingEvent loggingEvent in loggingEvents)
{
@@ -256,7 +256,7 @@ namespace log4net.Appender
/// <remarks>
/// Closed appenders cannot be reused.
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
lock(this)
{
@@ -271,7 +271,7 @@ namespace log4net.Appender
/// <value>
/// The <see cref="IErrorHandler"/> for this appender.
/// </value>
- override public IErrorHandler ErrorHandler
+ public override IErrorHandler ErrorHandler
{
get { return base.ErrorHandler; }
set
@@ -303,7 +303,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
@@ -320,7 +320,7 @@ namespace log4net.Appender
/// Writes the footer and closes the underlying <see cref="TextWriter"/>.
/// </para>
/// </remarks>
- virtual protected void WriteFooterAndCloseWriter()
+ protected virtual void WriteFooterAndCloseWriter()
{
WriteFooter();
CloseWriter();
@@ -334,7 +334,7 @@ namespace log4net.Appender
/// Closes the underlying <see cref="TextWriter"/>.
/// </para>
/// </remarks>
- virtual protected void CloseWriter()
+ protected virtual void CloseWriter()
{
if (m_qtw != null)
{
@@ -360,7 +360,7 @@ namespace log4net.Appender
/// Subclasses can override this method for an alternate closing behavior.
/// </para>
/// </remarks>
- virtual protected void Reset()
+ protected virtual void Reset()
{
WriteFooterAndCloseWriter();
m_qtw = null;
@@ -374,7 +374,7 @@ namespace log4net.Appender
/// Writes a footer as produced by the embedded layout's <see cref="ILayout.Footer"/> property.
/// </para>
/// </remarks>
- virtual protected void WriteFooter()
+ protected virtual void WriteFooter()
{
if (Layout != null && m_qtw != null && !m_qtw.Closed)
{
@@ -394,7 +394,7 @@ namespace log4net.Appender
/// Writes a header produced by the embedded layout's <see cref="ILayout.Header"/> property.
/// </para>
/// </remarks>
- virtual protected void WriteHeader()
+ protected virtual void WriteHeader()
{
if (Layout != null && m_qtw != null && !m_qtw.Closed)
{
@@ -416,7 +416,7 @@ namespace log4net.Appender
/// attempt to initialize the writer multiple times.
/// </para>
/// </remarks>
- virtual protected void PrepareWriter()
+ protected virtual void PrepareWriter()
{
}
@@ -478,7 +478,7 @@ namespace log4net.Appender
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(TextWriterAppender);
+ private static readonly Type declaringType = typeof(TextWriterAppender);
#endregion Private Static Fields
diff --git a/src/log4net/Appender/TraceAppender.cs b/src/log4net/Appender/TraceAppender.cs
index 18dd480..8e6cb7f 100644
--- a/src/log4net/Appender/TraceAppender.cs
+++ b/src/log4net/Appender/TraceAppender.cs
@@ -141,7 +141,7 @@ namespace log4net.Appender
/// Writes the logging event to the <see cref="System.Diagnostics.Trace"/> system.
/// </para>
/// </remarks>
- override protected void Append(LoggingEvent loggingEvent)
+ protected override void Append(LoggingEvent loggingEvent)
{
//
// Write the string to the Trace system
@@ -174,7 +174,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
diff --git a/src/log4net/Appender/UdpAppender.cs b/src/log4net/Appender/UdpAppender.cs
index 99a6a8c..e2cafe4 100644
--- a/src/log4net/Appender/UdpAppender.cs
+++ b/src/log4net/Appender/UdpAppender.cs
@@ -428,7 +428,7 @@ namespace log4net.Appender
/// This appender requires a <see cref="Layout"/> to be set.
/// </para>
/// </remarks>
- override protected bool RequiresLayout
+ protected override bool RequiresLayout
{
get { return true; }
}
@@ -443,7 +443,7 @@ namespace log4net.Appender
/// and unmanaged resources associated with the <see cref="UdpAppender" />.
/// </para>
/// </remarks>
- override protected void OnClose()
+ protected override void OnClose()
{
base.OnClose();
diff --git a/src/log4net/Config/BasicConfigurator.cs b/src/log4net/Config/BasicConfigurator.cs
index 4f0ee65..374cf72 100644
--- a/src/log4net/Config/BasicConfigurator.cs
+++ b/src/log4net/Config/BasicConfigurator.cs
@@ -62,7 +62,7 @@ namespace log4net.Config
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(BasicConfigurator);
+ private static readonly Type declaringType = typeof(BasicConfigurator);
#endregion Private Static Fields
@@ -97,7 +97,7 @@ namespace log4net.Config
/// layout style.
/// </para>
/// </remarks>
- static public ICollection Configure()
+ public static ICollection Configure()
{
return BasicConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
}
@@ -111,7 +111,7 @@ namespace log4net.Config
/// Initializes the log4net system using the specified appenders.
/// </para>
/// </remarks>
- static public ICollection Configure(params IAppender[] appenders)
+ public static ICollection Configure(params IAppender[] appenders)
{
ArrayList configurationMessages = new ArrayList();
@@ -136,7 +136,7 @@ namespace log4net.Config
/// Initializes the log4net system using the specified appender.
/// </para>
/// </remarks>
- static public ICollection Configure(IAppender appender)
+ public static ICollection Configure(IAppender appender)
{
return Configure(new IAppender[] { appender });
}
@@ -155,7 +155,7 @@ namespace log4net.Config
/// layout style.
/// </para>
/// </remarks>
- static public ICollection Configure(ILoggerRepository repository)
+ public static ICollection Configure(ILoggerRepository repository)
{
ArrayList configurationMessages = new ArrayList();
@@ -189,7 +189,7 @@ namespace log4net.Config
/// Initializes the <see cref="ILoggerRepository"/> using the specified appender.
/// </para>
/// </remarks>
- static public ICollection Configure(ILoggerRepository repository, IAppender appender)
+ public static ICollection Configure(ILoggerRepository repository, IAppender appender)
{
return Configure(repository, new IAppender[] { appender });
}
@@ -204,7 +204,7 @@ namespace log4net.Config
/// Initializes the <see cref="ILoggerRepository"/> using the specified appender.
/// </para>
/// </remarks>
- static public ICollection Configure(ILoggerRepository repository, params IAppender[] appenders)
+ public static ICollection Configure(ILoggerRepository repository, params IAppender[] appenders)
{
ArrayList configurationMessages = new ArrayList();
@@ -218,7 +218,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigure(ILoggerRepository repository, params IAppender[] appenders)
+ private static void InternalConfigure(ILoggerRepository repository, params IAppender[] appenders)
{
IBasicRepositoryConfigurator configurableRepository = repository as IBasicRepositoryConfigurator;
if (configurableRepository != null)
diff --git a/src/log4net/Config/DOMConfigurator.cs b/src/log4net/Config/DOMConfigurator.cs
index fd8eeb4..2dd16d8 100644
--- a/src/log4net/Config/DOMConfigurator.cs
+++ b/src/log4net/Config/DOMConfigurator.cs
@@ -75,7 +75,7 @@ namespace log4net.Config
/// <c>log4net</c> that contains the configuration data.
/// </remarks>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure()
+ public static void Configure()
{
XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
}
@@ -96,7 +96,7 @@ namespace log4net.Config
/// </remarks>
/// <param name="repository">The repository to configure.</param>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(ILoggerRepository repository)
+ public static void Configure(ILoggerRepository repository)
{
XmlConfigurator.Configure(repository);
}
@@ -113,7 +113,7 @@ namespace log4net.Config
/// </remarks>
/// <param name="element">The element to parse.</param>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(XmlElement element)
+ public static void Configure(XmlElement element)
{
XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), element);
}
@@ -132,7 +132,7 @@ namespace log4net.Config
/// <param name="repository">The repository to configure.</param>
/// <param name="element">The element to parse.</param>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(ILoggerRepository repository, XmlElement element)
+ public static void Configure(ILoggerRepository repository, XmlElement element)
{
XmlConfigurator.Configure(repository, element);
}
@@ -180,7 +180,7 @@ namespace log4net.Config
/// </code>
/// </remarks>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(FileInfo configFile)
+ public static void Configure(FileInfo configFile)
{
XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile);
}
@@ -203,7 +203,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(Stream configStream)
+ public static void Configure(Stream configStream)
{
XmlConfigurator.Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()), configStream);
}
@@ -253,7 +253,7 @@ namespace log4net.Config
/// </code>
/// </remarks>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(ILoggerRepository repository, FileInfo configFile)
+ public static void Configure(ILoggerRepository repository, FileInfo configFile)
{
XmlConfigurator.Configure(repository, configFile);
}
@@ -279,7 +279,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
[Obsolete("Use XmlConfigurator.Configure instead of DOMConfigurator.Configure")]
- static public void Configure(ILoggerRepository repository, Stream configStream)
+ public static void Configure(ILoggerRepository repository, Stream configStream)
{
XmlConfigurator.Configure(repository, configStream);
}
@@ -315,7 +315,7 @@ namespace log4net.Config
/// </remarks>
/// <seealso cref="M:Configure(FileInfo)"/>
[Obsolete("Use XmlConfigurator.ConfigureAndWatch instead of DOMConfigurator.ConfigureAndWatch")]
- static public void ConfigureAndWatch(FileInfo configFile)
+ public static void ConfigureAndWatch(FileInfo configFile)
{
XmlConfigurator.ConfigureAndWatch(LogManager.GetRepository(Assembly.GetCallingAssembly()), configFile);
}
@@ -347,7 +347,7 @@ namespace log4net.Config
/// </remarks>
/// <seealso cref="M:Configure(FileInfo)"/>
[Obsolete("Use XmlConfigurator.ConfigureAndWatch instead of DOMConfigurator.ConfigureAndWatch")]
- static public void ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
+ public static void ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
{
XmlConfigurator.ConfigureAndWatch(repository, configFile);
}
diff --git a/src/log4net/Config/PluginAttribute.cs b/src/log4net/Config/PluginAttribute.cs
index 67bbc08..b662972 100644
--- a/src/log4net/Config/PluginAttribute.cs
+++ b/src/log4net/Config/PluginAttribute.cs
@@ -175,7 +175,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
/// <returns>A representation of the properties of this object</returns>
- override public string ToString()
+ public override string ToString()
{
if (m_type != null)
{
diff --git a/src/log4net/Config/SecurityContextProviderAttribute.cs b/src/log4net/Config/SecurityContextProviderAttribute.cs
index c6f8557..7698c1b 100644
--- a/src/log4net/Config/SecurityContextProviderAttribute.cs
+++ b/src/log4net/Config/SecurityContextProviderAttribute.cs
@@ -102,7 +102,7 @@ namespace log4net.Config
/// Sets this as the default security context provider <see cref="SecurityContextProvider.DefaultProvider"/>.
/// </para>
/// </remarks>
- override public void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository)
+ public override void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository)
{
if (m_providerType == null)
{
@@ -142,7 +142,7 @@ namespace log4net.Config
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(SecurityContextProviderAttribute);
+ private static readonly Type declaringType = typeof(SecurityContextProviderAttribute);
#endregion Private Static Fields
}
diff --git a/src/log4net/Config/XmlConfigurator.cs b/src/log4net/Config/XmlConfigurator.cs
index cd9ebfe..ce37d2d 100644
--- a/src/log4net/Config/XmlConfigurator.cs
+++ b/src/log4net/Config/XmlConfigurator.cs
@@ -94,7 +94,7 @@ namespace log4net.Config
/// </remarks>
/// <param name="repository">The repository to configure.</param>
#endif
- static public ICollection Configure(ILoggerRepository repository)
+ public static ICollection Configure(ILoggerRepository repository)
{
ArrayList configurationMessages = new ArrayList();
@@ -108,7 +108,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigure(ILoggerRepository repository)
+ private static void InternalConfigure(ILoggerRepository repository)
{
LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using .config file section");
@@ -194,7 +194,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
#endif
- static public ICollection Configure()
+ public static ICollection Configure()
{
return Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
}
@@ -209,7 +209,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
/// <param name="element">The element to parse.</param>
- static public ICollection Configure(XmlElement element)
+ public static ICollection Configure(XmlElement element)
{
ArrayList configurationMessages = new ArrayList();
@@ -312,7 +312,7 @@ namespace log4net.Config
/// </code>
/// </remarks>
#endif
- static public ICollection Configure(FileInfo configFile)
+ public static ICollection Configure(FileInfo configFile)
{
ArrayList configurationMessages = new ArrayList();
@@ -338,7 +338,7 @@ namespace log4net.Config
/// The <see cref="System.Net.WebRequest"/> must support the URI scheme specified.
/// </para>
/// </remarks>
- static public ICollection Configure(Uri configUri)
+ public static ICollection Configure(Uri configUri)
{
ArrayList configurationMessages = new ArrayList();
@@ -367,7 +367,7 @@ namespace log4net.Config
/// Note that this method will NOT close the stream parameter.
/// </para>
/// </remarks>
- static public ICollection Configure(Stream configStream)
+ public static ICollection Configure(Stream configStream)
{
ArrayList configurationMessages = new ArrayList();
@@ -393,7 +393,7 @@ namespace log4net.Config
/// </remarks>
/// <param name="repository">The repository to configure.</param>
/// <param name="element">The element to parse.</param>
- static public ICollection Configure(ILoggerRepository repository, XmlElement element)
+ public static ICollection Configure(ILoggerRepository repository, XmlElement element)
{
ArrayList configurationMessages = new ArrayList();
@@ -500,7 +500,7 @@ namespace log4net.Config
/// </code>
/// </remarks>
#endif
- static public ICollection Configure(ILoggerRepository repository, FileInfo configFile)
+ public static ICollection Configure(ILoggerRepository repository, FileInfo configFile)
{
ArrayList configurationMessages = new ArrayList();
@@ -514,7 +514,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigure(ILoggerRepository repository, FileInfo configFile)
+ private static void InternalConfigure(ILoggerRepository repository, FileInfo configFile)
{
LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using file [" + configFile + "]");
@@ -589,7 +589,7 @@ namespace log4net.Config
/// The <see cref="System.Net.WebRequest"/> must support the URI scheme specified.
/// </para>
/// </remarks>
- static public ICollection Configure(ILoggerRepository repository, Uri configUri)
+ public static ICollection Configure(ILoggerRepository repository, Uri configUri)
{
ArrayList configurationMessages = new ArrayList();
@@ -603,7 +603,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigure(ILoggerRepository repository, Uri configUri)
+ private static void InternalConfigure(ILoggerRepository repository, Uri configUri)
{
LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using URI ["+configUri+"]");
@@ -683,7 +683,7 @@ namespace log4net.Config
/// Note that this method will NOT close the stream parameter.
/// </para>
/// </remarks>
- static public ICollection Configure(ILoggerRepository repository, Stream configStream)
+ public static ICollection Configure(ILoggerRepository repository, Stream configStream)
{
ArrayList configurationMessages = new ArrayList();
@@ -697,7 +697,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigure(ILoggerRepository repository, Stream configStream)
+ private static void InternalConfigure(ILoggerRepository repository, Stream configStream)
{
LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using stream");
@@ -803,7 +803,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
/// <seealso cref="M:Configure(FileInfo)"/>
- static public ICollection ConfigureAndWatch(FileInfo configFile)
+ public static ICollection ConfigureAndWatch(FileInfo configFile)
{
ArrayList configurationMessages = new ArrayList();
@@ -843,7 +843,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
/// <seealso cref="M:Configure(FileInfo)"/>
- static public ICollection ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
+ public static ICollection ConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
{
ArrayList configurationMessages = new ArrayList();
@@ -857,7 +857,7 @@ namespace log4net.Config
return configurationMessages;
}
- static private void InternalConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
+ private static void InternalConfigureAndWatch(ILoggerRepository repository, FileInfo configFile)
{
LogLog.Debug(declaringType, "configuring repository [" + repository.Name + "] using file [" + configFile + "] watching for file updates");
@@ -1070,7 +1070,7 @@ namespace log4net.Config
/// to load the configuration from an <see cref="XmlElement"/>.
/// </para>
/// </remarks>
- static private void InternalConfigureFromXml(ILoggerRepository repository, XmlElement element)
+ private static void InternalConfigureFromXml(ILoggerRepository repository, XmlElement element)
{
if (element == null)
{
@@ -1116,7 +1116,7 @@ namespace log4net.Config
/// ConfigAndWatchHandler to dispose of its FileSystemWatcher when a repository is
/// reconfigured.
/// </summary>
- private readonly static Hashtable m_repositoryName2ConfigAndWatchHandler = new Hashtable();
+ private static readonly Hashtable m_repositoryName2ConfigAndWatchHandler = new Hashtable();
/// <summary>
/// The fully qualified type of the XmlConfigurator class.
@@ -1125,7 +1125,7 @@ namespace log4net.Config
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(XmlConfigurator);
+ private static readonly Type declaringType = typeof(XmlConfigurator);
#endregion Private Static Fields
}
diff --git a/src/log4net/Config/XmlConfiguratorAttribute.cs b/src/log4net/Config/XmlConfiguratorAttribute.cs
index 6c3ea3e..b5cc702 100644
--- a/src/log4net/Config/XmlConfiguratorAttribute.cs
+++ b/src/log4net/Config/XmlConfiguratorAttribute.cs
@@ -196,7 +196,7 @@ namespace log4net.Config
/// </para>
/// </remarks>
/// <exception cref="ArgumentOutOfRangeException">The <paramref name="targetRepository" /> does not extend <see cref="Hierarchy"/>.</exception>
- override public void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository)
+ public override void Configure(Assembly sourceAssembly, ILoggerRepository targetRepository)
{
IList configurationMessages = new ArrayList();
@@ -460,7 +460,7 @@ namespace log4net.Config
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(XmlConfiguratorAttribute);
+ private static readonly Type declaringType = typeof(XmlConfiguratorAttribute);
#endregion Private Static Fields
}
diff --git a/src/log4net/Core/CompactRepositorySelector.cs b/src/log4net/Core/CompactRepositorySelector.cs
index dd46f6d..b1b2805 100644
--- a/src/log4net/Core/CompactRepositorySelector.cs
+++ b/src/log4net/Core/CompactRepositorySelector.cs
@@ -311,7 +311,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(CompactRepositorySelector);
+ private static readonly Type declaringType = typeof(CompactRepositorySelector);
#endregion Private Static Fields
diff --git a/src/log4net/Core/DefaultRepositorySelector.cs b/src/log4net/Core/DefaultRepositorySelector.cs
index ce39921..2cc84d2 100644
--- a/src/log4net/Core/DefaultRepositorySelector.cs
+++ b/src/log4net/Core/DefaultRepositorySelector.cs
@@ -891,7 +891,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(DefaultRepositorySelector);
+ private static readonly Type declaringType = typeof(DefaultRepositorySelector);
private const string DefaultRepositoryName = "log4net-default-repository";
diff --git a/src/log4net/Core/Level.cs b/src/log4net/Core/Level.cs
index 713918d..767d03e 100644
--- a/src/log4net/Core/Level.cs
+++ b/src/log4net/Core/Level.cs
@@ -83,7 +83,7 @@ namespace log4net.Core
#if !NETCF
[Serializable]
#endif
- sealed public class Level : IComparable
+ public sealed class Level : IComparable
{
#region Public Instance Constructors
@@ -202,7 +202,7 @@ namespace log4net.Core
/// Returns the level <see cref="Name"/>.
/// </para>
/// </remarks>
- override public string ToString()
+ public override string ToString()
{
return m_levelName;
}
@@ -219,7 +219,7 @@ namespace log4net.Core
/// instance.
/// </para>
/// </remarks>
- override public bool Equals(object o)
+ public override bool Equals(object o)
{
Level otherLevel = o as Level;
if (otherLevel != null)
@@ -245,7 +245,7 @@ namespace log4net.Core
/// Returns the hash code of the level <see cref="Value"/>.
/// </para>
/// </remarks>
- override public int GetHashCode()
+ public override int GetHashCode()
{
return m_levelValue;
}
@@ -500,107 +500,107 @@ namespace log4net.Core
/// <summary>
/// The <see cref="Off" /> level designates a higher level than all the rest.
/// </summary>
- public readonly static Level Off = new Level(int.MaxValue, "OFF");
+ public static readonly Level Off = new Level(int.MaxValue, "OFF");
/// <summary>
/// The <see cref="Emergency" /> level designates very severe error events.
/// System unusable, emergencies.
/// </summary>
- public readonly static Level Log4Net_Debug = new Level(120000, "log4net:DEBUG");
+ public static readonly Level Log4Net_Debug = new Level(120000, "log4net:DEBUG");
/// <summary>
/// The <see cref="Emergency" /> level designates very severe error events.
/// System unusable, emergencies.
/// </summary>
- public readonly static Level Emergency = new Level(120000, "EMERGENCY");
+ public static readonly Level Emergency = new Level(120000, "EMERGENCY");
/// <summary>
/// The <see cref="Fatal" /> level designates very severe error events
/// that will presumably lead the application to abort.
/// </summary>
- public readonly static Level Fatal = new Level(110000, "FATAL");
+ public static readonly Level Fatal = new Level(110000, "FATAL");
/// <summary>
/// The <see cref="Alert" /> level designates very severe error events.
/// Take immediate action, alerts.
/// </summary>
- public readonly static Level Alert = new Level(100000, "ALERT");
+ public static readonly Level Alert = new Level(100000, "ALERT");
/// <summary>
/// The <see cref="Critical" /> level designates very severe error events.
/// Critical condition, critical.
/// </summary>
- public readonly static Level Critical = new Level(90000, "CRITICAL");
+ public static readonly Level Critical = new Level(90000, "CRITICAL");
/// <summary>
/// The <see cref="Severe" /> level designates very severe error events.
/// </summary>
- public readonly static Level Severe = new Level(80000, "SEVERE");
+ public static readonly Level Severe = new Level(80000, "SEVERE");
/// <summary>
/// The <see cref="Error" /> level designates error events that might
/// still allow the application to continue running.
/// </summary>
- public readonly static Level Error = new Level(70000, "ERROR");
+ public static readonly Level Error = new Level(70000, "ERROR");
/// <summary>
/// The <see cref="Warn" /> level designates potentially harmful
/// situations.
/// </summary>
- public readonly static Level Warn = new Level(60000, "WARN");
+ public static readonly Level Warn = new Level(60000, "WARN");
/// <summary>
/// The <see cref="Notice" /> level designates informational messages
/// that highlight the progress of the application at the highest level.
/// </summary>
- public readonly static Level Notice = new Level(50000, "NOTICE");
+ public static readonly Level Notice = new Level(50000, "NOTICE");
/// <summary>
/// The <see cref="Info" /> level designates informational messages that
/// highlight the progress of the application at coarse-grained level.
/// </summary>
- public readonly static Level Info = new Level(40000, "INFO");
+ public static readonly Level Info = new Level(40000, "INFO");
/// <summary>
/// The <see cref="Debug" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Debug = new Level(30000, "DEBUG");
+ public static readonly Level Debug = new Level(30000, "DEBUG");
/// <summary>
/// The <see cref="Fine" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Fine = new Level(30000, "FINE");
+ public static readonly Level Fine = new Level(30000, "FINE");
/// <summary>
/// The <see cref="Trace" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Trace = new Level(20000, "TRACE");
+ public static readonly Level Trace = new Level(20000, "TRACE");
/// <summary>
/// The <see cref="Finer" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Finer = new Level(20000, "FINER");
+ public static readonly Level Finer = new Level(20000, "FINER");
/// <summary>
/// The <see cref="Verbose" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Verbose = new Level(10000, "VERBOSE");
+ public static readonly Level Verbose = new Level(10000, "VERBOSE");
/// <summary>
/// The <see cref="Finest" /> level designates fine-grained informational
/// events that are most useful to debug an application.
/// </summary>
- public readonly static Level Finest = new Level(10000, "FINEST");
+ public static readonly Level Finest = new Level(10000, "FINEST");
/// <summary>
/// The <see cref="All" /> level designates the lowest level possible.
/// </summary>
- public readonly static Level All = new Level(int.MinValue, "ALL");
+ public static readonly Level All = new Level(int.MinValue, "ALL");
#endregion Public Static Fields
diff --git a/src/log4net/Core/LocationInfo.cs b/src/log4net/Core/LocationInfo.cs
index d8ae92b..d364f9d 100644
--- a/src/log4net/Core/LocationInfo.cs
+++ b/src/log4net/Core/LocationInfo.cs
@@ -307,7 +307,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(LocationInfo);
+ private static readonly Type declaringType = typeof(LocationInfo);
/// <summary>
/// When location information is not available the constant
diff --git a/src/log4net/Core/LogImpl.cs b/src/log4net/Core/LogImpl.cs
index 64c2edf..f997ac3 100644
--- a/src/log4net/Core/LogImpl.cs
+++ b/src/log4net/Core/LogImpl.cs
@@ -165,7 +165,7 @@ namespace log4net.Core
/// <see cref="M:Debug(object,Exception)"/> form instead.
/// </para>
/// </remarks>
- virtual public void Debug(object message)
+ public virtual void Debug(object message)
{
Logger.Log(ThisDeclaringType, m_levelDebug, message, null);
}
@@ -186,7 +186,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="M:Debug(object)"/>
- virtual public void Debug(object message, Exception exception)
+ public virtual void Debug(object message, Exception exception)
{
Logger.Log(ThisDeclaringType, m_levelDebug, message, exception);
}
@@ -213,7 +213,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void DebugFormat(string format, params object[] args)
+ public virtual void DebugFormat(string format, params object[] args)
{
if (IsDebugEnabled)
{
@@ -243,7 +243,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void DebugFormat(string format, object arg0)
+ public virtual void DebugFormat(string format, object arg0)
{
if (IsDebugEnabled)
{
@@ -274,7 +274,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void DebugFormat(string format, object arg0, object arg1)
+ public virtual void DebugFormat(string format, object arg0, object arg1)
{
if (IsDebugEnabled)
{
@@ -306,7 +306,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void DebugFormat(string format, object arg0, object arg1, object arg2)
+ public virtual void DebugFormat(string format, object arg0, object arg1, object arg2)
{
if (IsDebugEnabled)
{
@@ -332,7 +332,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void DebugFormat(IFormatProvider provider, string format, params object[] args)
+ public virtual void DebugFormat(IFormatProvider provider, string format, params object[] args)
{
if (IsDebugEnabled)
{
@@ -363,7 +363,7 @@ namespace log4net.Core
/// <see cref="M:Info(object,Exception)"/> form instead.
/// </para>
/// </remarks>
- virtual public void Info(object message)
+ public virtual void Info(object message)
{
Logger.Log(ThisDeclaringType, m_levelInfo, message, null);
}
@@ -384,7 +384,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="M:Info(object)"/>
- virtual public void Info(object message, Exception exception)
+ public virtual void Info(object message, Exception exception)
{
Logger.Log(ThisDeclaringType, m_levelInfo, message, exception);
}
@@ -411,7 +411,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void InfoFormat(string format, params object[] args)
+ public virtual void InfoFormat(string format, params object[] args)
{
if (IsInfoEnabled)
{
@@ -441,7 +441,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void InfoFormat(string format, object arg0)
+ public virtual void InfoFormat(string format, object arg0)
{
if (IsInfoEnabled)
{
@@ -472,7 +472,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void InfoFormat(string format, object arg0, object arg1)
+ public virtual void InfoFormat(string format, object arg0, object arg1)
{
if (IsInfoEnabled)
{
@@ -504,7 +504,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void InfoFormat(string format, object arg0, object arg1, object arg2)
+ public virtual void InfoFormat(string format, object arg0, object arg1, object arg2)
{
if (IsInfoEnabled)
{
@@ -530,7 +530,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void InfoFormat(IFormatProvider provider, string format, params object[] args)
+ public virtual void InfoFormat(IFormatProvider provider, string format, params object[] args)
{
if (IsInfoEnabled)
{
@@ -561,7 +561,7 @@ namespace log4net.Core
/// <see cref="M:Warn(object,Exception)"/> form instead.
/// </para>
/// </remarks>
- virtual public void Warn(object message)
+ public virtual void Warn(object message)
{
Logger.Log(ThisDeclaringType, m_levelWarn, message, null);
}
@@ -582,7 +582,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="M:Warn(object)"/>
- virtual public void Warn(object message, Exception exception)
+ public virtual void Warn(object message, Exception exception)
{
Logger.Log(ThisDeclaringType, m_levelWarn, message, exception);
}
@@ -609,7 +609,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void WarnFormat(string format, params object[] args)
+ public virtual void WarnFormat(string format, params object[] args)
{
if (IsWarnEnabled)
{
@@ -639,7 +639,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void WarnFormat(string format, object arg0)
+ public virtual void WarnFormat(string format, object arg0)
{
if (IsWarnEnabled)
{
@@ -670,7 +670,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void WarnFormat(string format, object arg0, object arg1)
+ public virtual void WarnFormat(string format, object arg0, object arg1)
{
if (IsWarnEnabled)
{
@@ -702,7 +702,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void WarnFormat(string format, object arg0, object arg1, object arg2)
+ public virtual void WarnFormat(string format, object arg0, object arg1, object arg2)
{
if (IsWarnEnabled)
{
@@ -728,7 +728,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void WarnFormat(IFormatProvider provider, string format, params object[] args)
+ public virtual void WarnFormat(IFormatProvider provider, string format, params object[] args)
{
if (IsWarnEnabled)
{
@@ -759,7 +759,7 @@ namespace log4net.Core
/// <see cref="M:Error(object,Exception)"/> form instead.
/// </para>
/// </remarks>
- virtual public void Error(object message)
+ public virtual void Error(object message)
{
Logger.Log(ThisDeclaringType, m_levelError, message, null);
}
@@ -780,7 +780,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="M:Error(object)"/>
- virtual public void Error(object message, Exception exception)
+ public virtual void Error(object message, Exception exception)
{
Logger.Log(ThisDeclaringType, m_levelError, message, exception);
}
@@ -807,7 +807,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void ErrorFormat(string format, params object[] args)
+ public virtual void ErrorFormat(string format, params object[] args)
{
if (IsErrorEnabled)
{
@@ -837,7 +837,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void ErrorFormat(string format, object arg0)
+ public virtual void ErrorFormat(string format, object arg0)
{
if (IsErrorEnabled)
{
@@ -868,7 +868,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void ErrorFormat(string format, object arg0, object arg1)
+ public virtual void ErrorFormat(string format, object arg0, object arg1)
{
if (IsErrorEnabled)
{
@@ -900,7 +900,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void ErrorFormat(string format, object arg0, object arg1, object arg2)
+ public virtual void ErrorFormat(string format, object arg0, object arg1, object arg2)
{
if (IsErrorEnabled)
{
@@ -926,7 +926,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void ErrorFormat(IFormatProvider provider, string format, params object[] args)
+ public virtual void ErrorFormat(IFormatProvider provider, string format, params object[] args)
{
if (IsErrorEnabled)
{
@@ -957,7 +957,7 @@ namespace log4net.Core
/// <see cref="M:Fatal(object,Exception)"/> form instead.
/// </para>
/// </remarks>
- virtual public void Fatal(object message)
+ public virtual void Fatal(object message)
{
Logger.Log(ThisDeclaringType, m_levelFatal, message, null);
}
@@ -978,7 +978,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="M:Fatal(object)"/>
- virtual public void Fatal(object message, Exception exception)
+ public virtual void Fatal(object message, Exception exception)
{
Logger.Log(ThisDeclaringType, m_levelFatal, message, exception);
}
@@ -1005,7 +1005,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void FatalFormat(string format, params object[] args)
+ public virtual void FatalFormat(string format, params object[] args)
{
if (IsFatalEnabled)
{
@@ -1035,7 +1035,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void FatalFormat(string format, object arg0)
+ public virtual void FatalFormat(string format, object arg0)
{
if (IsFatalEnabled)
{
@@ -1066,7 +1066,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void FatalFormat(string format, object arg0, object arg1)
+ public virtual void FatalFormat(string format, object arg0, object arg1)
{
if (IsFatalEnabled)
{
@@ -1098,7 +1098,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void FatalFormat(string format, object arg0, object arg1, object arg2)
+ public virtual void FatalFormat(string format, object arg0, object arg1, object arg2)
{
if (IsFatalEnabled)
{
@@ -1124,7 +1124,7 @@ namespace log4net.Core
/// methods instead.
/// </para>
/// </remarks>
- virtual public void FatalFormat(IFormatProvider provider, string format, params object[] args)
+ public virtual void FatalFormat(IFormatProvider provider, string format, params object[] args)
{
if (IsFatalEnabled)
{
@@ -1175,7 +1175,7 @@ namespace log4net.Core
/// takes to actually log.
/// </para>
/// </remarks>
- virtual public bool IsDebugEnabled
+ public virtual bool IsDebugEnabled
{
get { return Logger.IsEnabledFor(m_levelDebug); }
}
@@ -1194,7 +1194,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="LogImpl.IsDebugEnabled"/>
- virtual public bool IsInfoEnabled
+ public virtual bool IsInfoEnabled
{
get { return Logger.IsEnabledFor(m_levelInfo); }
}
@@ -1213,7 +1213,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="ILog.IsDebugEnabled"/>
- virtual public bool IsWarnEnabled
+ public virtual bool IsWarnEnabled
{
get { return Logger.IsEnabledFor(m_levelWarn); }
}
@@ -1231,7 +1231,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="ILog.IsDebugEnabled"/>
- virtual public bool IsErrorEnabled
+ public virtual bool IsErrorEnabled
{
get { return Logger.IsEnabledFor(m_levelError); }
}
@@ -1249,7 +1249,7 @@ namespace log4net.Core
/// </para>
/// </remarks>
/// <seealso cref="ILog.IsDebugEnabled"/>
- virtual public bool IsFatalEnabled
+ public virtual bool IsFatalEnabled
{
get { return Logger.IsEnabledFor(m_levelFatal); }
}
@@ -1279,7 +1279,7 @@ namespace log4net.Core
/// <summary>
/// The fully qualified name of this declaring type not the type of any subclass.
/// </summary>
- private readonly static Type ThisDeclaringType = typeof(LogImpl);
+ private static readonly Type ThisDeclaringType = typeof(LogImpl);
#endregion Private Static Instance Fields
diff --git a/src/log4net/Core/LoggerManager.cs b/src/log4net/Core/LoggerManager.cs
index 52b6c7b..98a2fe8 100644
--- a/src/log4net/Core/LoggerManager.cs
+++ b/src/log4net/Core/LoggerManager.cs
@@ -866,7 +866,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(LoggerManager);
+ private static readonly Type declaringType = typeof(LoggerManager);
/// <summary>
/// Initialize the default repository selector
diff --git a/src/log4net/Core/LoggerWrapperImpl.cs b/src/log4net/Core/LoggerWrapperImpl.cs
index fff496d..26f016d 100644
--- a/src/log4net/Core/LoggerWrapperImpl.cs
+++ b/src/log4net/Core/LoggerWrapperImpl.cs
@@ -67,7 +67,7 @@ namespace log4net.Core
/// the log events.
/// </para>
/// </remarks>
- virtual public ILogger Logger
+ public virtual ILogger Logger
{
get { return m_logger; }
}
diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs
index 0c73300..c09937a 100644
--- a/src/log4net/Core/LoggingEvent.cs
+++ b/src/log4net/Core/LoggingEvent.cs
@@ -328,7 +328,7 @@ namespace log4net.Core
: ISerializable
#endif
{
- private readonly static Type declaringType = typeof(LoggingEvent);
+ private static readonly Type declaringType = typeof(LoggingEvent);
#region Public Instance Constructors
diff --git a/src/log4net/Core/MethodItem.cs b/src/log4net/Core/MethodItem.cs
index e2ff3c3..6d3ca19 100644
--- a/src/log4net/Core/MethodItem.cs
+++ b/src/log4net/Core/MethodItem.cs
@@ -156,7 +156,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(MethodItem);
+ private static readonly Type declaringType = typeof(MethodItem);
/// <summary>
/// When location information is not available the constant
diff --git a/src/log4net/Core/StackFrameItem.cs b/src/log4net/Core/StackFrameItem.cs
index 83f0351..1719326 100644
--- a/src/log4net/Core/StackFrameItem.cs
+++ b/src/log4net/Core/StackFrameItem.cs
@@ -180,7 +180,7 @@ namespace log4net.Core
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(StackFrameItem);
+ private static readonly Type declaringType = typeof(StackFrameItem);
/// <summary>
/// When location information is not available the constant
diff --git a/src/log4net/Core/WrapperMap.cs b/src/log4net/Core/WrapperMap.cs
index a43a8b8..d4f5b25 100644
--- a/src/log4net/Core/WrapperMap.cs
+++ b/src/log4net/Core/WrapperMap.cs
@@ -105,7 +105,7 @@ namespace log4net.Core
/// called.
/// </para>
/// </remarks>
- virtual public ILoggerWrapper GetWrapper(ILogger logger)
+ public virtual ILoggerWrapper GetWrapper(ILogger logger)
{
// If the logger is null then the corresponding wrapper is null
if (logger == null)
@@ -186,7 +186,7 @@ namespace log4net.Core
/// can be overridden in a subclass.
/// </para>
/// </remarks>
- virtual protected ILoggerWrapper CreateNewWrapperObject(ILogger logger)
+ protected virtual ILoggerWrapper CreateNewWrapperObject(ILogger logger)
{
if (m_createWrapperHandler != null)
{
@@ -208,7 +208,7 @@ namespace log4net.Core
/// and their wrappers generated for this repository.
/// </para>
/// </remarks>
- virtual protected void RepositoryShutdown(ILoggerRepository repository)
+ protected virtual void RepositoryShutdown(ILoggerRepository repository)
{
lock(this)
{
diff --git a/src/log4net/DateFormatter/AbsoluteTimeDateFormatter.cs b/src/log4net/DateFormatter/AbsoluteTimeDateFormatter.cs
index 1174107..c633303 100644
--- a/src/log4net/DateFormatter/AbsoluteTimeDateFormatter.cs
+++ b/src/log4net/DateFormatter/AbsoluteTimeDateFormatter.cs
@@ -51,7 +51,7 @@ namespace log4net.DateFormatter
/// reused if it is needed again during the same second.
/// </para>
/// </remarks>
- virtual protected void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
+ protected virtual void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
{
int hour = dateToFormat.Hour;
if (hour < 10)
@@ -99,7 +99,7 @@ namespace log4net.DateFormatter
/// rather than <see cref="FormatDate"/>.
/// </para>
/// </remarks>
- virtual public void FormatDate(DateTime dateToFormat, TextWriter writer)
+ public virtual void FormatDate(DateTime dateToFormat, TextWriter writer)
{
lock (s_lastTimeStrings)
{
diff --git a/src/log4net/DateFormatter/DateTimeDateFormatter.cs b/src/log4net/DateFormatter/DateTimeDateFormatter.cs
index 03dcca9..7411206 100644
--- a/src/log4net/DateFormatter/DateTimeDateFormatter.cs
+++ b/src/log4net/DateFormatter/DateTimeDateFormatter.cs
@@ -72,7 +72,7 @@ namespace log4net.DateFormatter
/// This method will only be called at most once per second.
/// </para>
/// </remarks>
- override protected void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
+ protected override void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
{
int day = dateToFormat.Day;
if (day < 10)
diff --git a/src/log4net/DateFormatter/Iso8601DateFormatter.cs b/src/log4net/DateFormatter/Iso8601DateFormatter.cs
index a7e88d5..524c8a7 100644
--- a/src/log4net/DateFormatter/Iso8601DateFormatter.cs
+++ b/src/log4net/DateFormatter/Iso8601DateFormatter.cs
@@ -66,7 +66,7 @@ namespace log4net.DateFormatter
/// This method will only be called at most once per second.
/// </para>
/// </remarks>
- override protected void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
+ protected override void FormatDateWithoutMillis(DateTime dateToFormat, StringBuilder buffer)
{
buffer.Append(dateToFormat.Year);
diff --git a/src/log4net/DateFormatter/SimpleDateFormatter.cs b/src/log4net/DateFormatter/SimpleDateFormatter.cs
index c112ca1..3efb164 100644
--- a/src/log4net/DateFormatter/SimpleDateFormatter.cs
+++ b/src/log4net/DateFormatter/SimpleDateFormatter.cs
@@ -70,7 +70,7 @@ namespace log4net.DateFormatter
/// the <see cref="M:DateTime.ToString(string, IFormatProvider)"/> method to format the date.
/// </para>
/// </remarks>
- virtual public void FormatDate(DateTime dateToFormat, TextWriter writer)
+ public virtual void FormatDate(DateTime dateToFormat, TextWriter writer)
{
writer.Write(dateToFormat.ToString(m_formatString, System.Globalization.DateTimeFormatInfo.InvariantInfo));
}
diff --git a/src/log4net/Filter/DenyAllFilter.cs b/src/log4net/Filter/DenyAllFilter.cs
index e17a16f..ab377f1 100644
--- a/src/log4net/Filter/DenyAllFilter.cs
+++ b/src/log4net/Filter/DenyAllFilter.cs
@@ -65,7 +65,7 @@ namespace log4net.Filter
/// as any further filters will be ignored!
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
return FilterDecision.Deny;
}
diff --git a/src/log4net/Filter/FilterSkeleton.cs b/src/log4net/Filter/FilterSkeleton.cs
index 9cc24d8..293d3ca 100644
--- a/src/log4net/Filter/FilterSkeleton.cs
+++ b/src/log4net/Filter/FilterSkeleton.cs
@@ -104,7 +104,7 @@ namespace log4net.Filter
/// however this method must still be called.
/// </para>
/// </remarks>
- virtual public void ActivateOptions()
+ public virtual void ActivateOptions()
{
}
@@ -130,7 +130,7 @@ namespace log4net.Filter
/// in a subclass.
/// </para>
/// </remarks>
- abstract public FilterDecision Decide(LoggingEvent loggingEvent);
+ public abstract FilterDecision Decide(LoggingEvent loggingEvent);
/// <summary>
/// Property to get and set the next filter
diff --git a/src/log4net/Filter/LevelMatchFilter.cs b/src/log4net/Filter/LevelMatchFilter.cs
index 2d3465a..34a21b3 100644
--- a/src/log4net/Filter/LevelMatchFilter.cs
+++ b/src/log4net/Filter/LevelMatchFilter.cs
@@ -122,7 +122,7 @@ namespace log4net.Filter
/// the result will be <see cref="FilterDecision.Neutral"/>.
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Filter/LevelRangeFilter.cs b/src/log4net/Filter/LevelRangeFilter.cs
index 9afc03a..f6e0be0 100644
--- a/src/log4net/Filter/LevelRangeFilter.cs
+++ b/src/log4net/Filter/LevelRangeFilter.cs
@@ -142,7 +142,7 @@ namespace log4net.Filter
/// <see cref="FilterDecision.Neutral"/> is returned.
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Filter/LoggerMatchFilter.cs b/src/log4net/Filter/LoggerMatchFilter.cs
index 828a304..28264ec 100644
--- a/src/log4net/Filter/LoggerMatchFilter.cs
+++ b/src/log4net/Filter/LoggerMatchFilter.cs
@@ -129,7 +129,7 @@ namespace log4net.Filter
/// <see cref="FilterDecision.Deny"/> is returned.
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Filter/PropertyFilter.cs b/src/log4net/Filter/PropertyFilter.cs
index 8c35c7f..a74a03b 100644
--- a/src/log4net/Filter/PropertyFilter.cs
+++ b/src/log4net/Filter/PropertyFilter.cs
@@ -94,7 +94,7 @@ namespace log4net.Filter
/// <see cref="FilterDecision.Deny"/> is returned.
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Filter/StringMatchFilter.cs b/src/log4net/Filter/StringMatchFilter.cs
index 38fa49d..840a95d 100644
--- a/src/log4net/Filter/StringMatchFilter.cs
+++ b/src/log4net/Filter/StringMatchFilter.cs
@@ -91,7 +91,7 @@ namespace log4net.Filter
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
if (m_stringRegexToMatch != null)
{
@@ -186,7 +186,7 @@ namespace log4net.Filter
/// <see cref="FilterDecision.Deny"/> is returned.
/// </para>
/// </remarks>
- override public FilterDecision Decide(LoggingEvent loggingEvent)
+ public override FilterDecision Decide(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/GlobalContext.cs b/src/log4net/GlobalContext.cs
index dd02a90..222b90c 100644
--- a/src/log4net/GlobalContext.cs
+++ b/src/log4net/GlobalContext.cs
@@ -95,7 +95,7 @@ namespace log4net
/// <summary>
/// The global context properties instance
/// </summary>
- private readonly static GlobalContextProperties s_properties = new GlobalContextProperties();
+ private static readonly GlobalContextProperties s_properties = new GlobalContextProperties();
#endregion Private Static Fields
}
diff --git a/src/log4net/Layout/ExceptionLayout.cs b/src/log4net/Layout/ExceptionLayout.cs
index 06c4509..9021707 100644
--- a/src/log4net/Layout/ExceptionLayout.cs
+++ b/src/log4net/Layout/ExceptionLayout.cs
@@ -73,7 +73,7 @@ namespace log4net.Layout
/// This method does nothing as options become effective immediately.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
// nothing to do.
}
@@ -93,7 +93,7 @@ namespace log4net.Layout
/// The exception string is retrieved from <see cref="M:LoggingEvent.GetExceptionString()"/>.
/// </para>
/// </remarks>
- override public void Format(TextWriter writer, LoggingEvent loggingEvent)
+ public override void Format(TextWriter writer, LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Layout/Layout2RawLayoutAdapter.cs b/src/log4net/Layout/Layout2RawLayoutAdapter.cs
index 4945784..9b92bf4 100644
--- a/src/log4net/Layout/Layout2RawLayoutAdapter.cs
+++ b/src/log4net/Layout/Layout2RawLayoutAdapter.cs
@@ -81,7 +81,7 @@ namespace log4net.Layout
/// the constructor to perform the formatting.
/// </para>
/// </remarks>
- virtual public object Format(LoggingEvent loggingEvent)
+ public virtual object Format(LoggingEvent loggingEvent)
{
using StringWriter writer = new StringWriter(System.Globalization.CultureInfo.InvariantCulture);
m_layout.Format(writer, loggingEvent);
diff --git a/src/log4net/Layout/LayoutSkeleton.cs b/src/log4net/Layout/LayoutSkeleton.cs
index afae60e..1f26c8e 100644
--- a/src/log4net/Layout/LayoutSkeleton.cs
+++ b/src/log4net/Layout/LayoutSkeleton.cs
@@ -121,7 +121,7 @@ namespace log4net.Layout
/// This method must be implemented by the subclass.
/// </para>
/// </remarks>
- abstract public void ActivateOptions();
+ public abstract void ActivateOptions();
#endregion
@@ -138,7 +138,7 @@ namespace log4net.Layout
/// the <paramref name="loggingEvent"/> as text.
/// </para>
/// </remarks>
- abstract public void Format(TextWriter writer, LoggingEvent loggingEvent);
+ public abstract void Format(TextWriter writer, LoggingEvent loggingEvent);
/// <summary>
/// Convenience method for easily formatting the logging event into a string variable.
@@ -168,7 +168,7 @@ namespace log4net.Layout
/// property.
/// </para>
/// </remarks>
- virtual public string ContentType
+ public virtual string ContentType
{
get { return "text/plain"; }
}
@@ -183,7 +183,7 @@ namespace log4net.Layout
/// are formatted and appended.
/// </para>
/// </remarks>
- virtual public string Header
+ public virtual string Header
{
get { return m_header; }
set { m_header = value; }
@@ -199,7 +199,7 @@ namespace log4net.Layout
/// have been formatted and appended.
/// </para>
/// </remarks>
- virtual public string Footer
+ public virtual string Footer
{
get { return m_footer; }
set { m_footer = value; }
@@ -221,7 +221,7 @@ namespace log4net.Layout
/// value is <c>true</c>, this layout does not handle the exception.
/// </para>
/// </remarks>
- virtual public bool IgnoresException
+ public virtual bool IgnoresException
{
get { return m_ignoresException; }
set { m_ignoresException = value; }
diff --git a/src/log4net/Layout/Pattern/AppDomainPatternConverter.cs b/src/log4net/Layout/Pattern/AppDomainPatternConverter.cs
index 37369c4..30b7f09 100644
--- a/src/log4net/Layout/Pattern/AppDomainPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/AppDomainPatternConverter.cs
@@ -47,7 +47,7 @@ namespace log4net.Layout.Pattern
/// Writes the <see cref="LoggingEvent.Domain"/> to the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.Domain);
}
diff --git a/src/log4net/Layout/Pattern/DatePatternConverter.cs b/src/log4net/Layout/Pattern/DatePatternConverter.cs
index 72d3df1..c283ba1 100644
--- a/src/log4net/Layout/Pattern/DatePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/DatePatternConverter.cs
@@ -161,7 +161,7 @@ namespace log4net.Layout.Pattern
/// The <see cref="LoggingEvent.TimeStamp"/> passed is in the local time zone.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
try
{
@@ -182,7 +182,7 @@ namespace log4net.Layout.Pattern
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(DatePatternConverter);
+ private static readonly Type declaringType = typeof(DatePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Layout/Pattern/ExceptionPatternConverter.cs b/src/log4net/Layout/Pattern/ExceptionPatternConverter.cs
index 7ab88d0..0091304 100644
--- a/src/log4net/Layout/Pattern/ExceptionPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/ExceptionPatternConverter.cs
@@ -90,7 +90,7 @@ namespace log4net.Layout.Pattern
/// </item>
/// </list>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
if (loggingEvent.ExceptionObject != null && Option != null && Option.Length > 0)
{
diff --git a/src/log4net/Layout/Pattern/FileLocationPatternConverter.cs b/src/log4net/Layout/Pattern/FileLocationPatternConverter.cs
index bcec221..d555c61 100644
--- a/src/log4net/Layout/Pattern/FileLocationPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/FileLocationPatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.LocationInformation.FileName);
}
diff --git a/src/log4net/Layout/Pattern/FullLocationPatternConverter.cs b/src/log4net/Layout/Pattern/FullLocationPatternConverter.cs
index 2a3beda..ac5dab6 100644
--- a/src/log4net/Layout/Pattern/FullLocationPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/FullLocationPatternConverter.cs
@@ -46,7 +46,7 @@ namespace log4net.Layout.Pattern
/// Writes the <see cref="LocationInfo.FullInfo"/> to the output writer.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write( loggingEvent.LocationInformation.FullInfo );
}
diff --git a/src/log4net/Layout/Pattern/IdentityPatternConverter.cs b/src/log4net/Layout/Pattern/IdentityPatternConverter.cs
index fd84299..0ef245c 100644
--- a/src/log4net/Layout/Pattern/IdentityPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/IdentityPatternConverter.cs
@@ -50,7 +50,7 @@ namespace log4net.Layout.Pattern
/// the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.Identity);
}
diff --git a/src/log4net/Layout/Pattern/LevelPatternConverter.cs b/src/log4net/Layout/Pattern/LevelPatternConverter.cs
index 35227e0..21af92b 100644
--- a/src/log4net/Layout/Pattern/LevelPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/LevelPatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// to the <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write( loggingEvent.Level.DisplayName );
}
diff --git a/src/log4net/Layout/Pattern/LineLocationPatternConverter.cs b/src/log4net/Layout/Pattern/LineLocationPatternConverter.cs
index 2e54dfa..07c91e8 100644
--- a/src/log4net/Layout/Pattern/LineLocationPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/LineLocationPatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// the <paramref name="loggingEvent"/> to the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.LocationInformation.LineNumber);
}
diff --git a/src/log4net/Layout/Pattern/LoggerPatternConverter.cs b/src/log4net/Layout/Pattern/LoggerPatternConverter.cs
index b56f7c9..471b4aa 100644
--- a/src/log4net/Layout/Pattern/LoggerPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/LoggerPatternConverter.cs
@@ -46,7 +46,7 @@ namespace log4net.Layout.Pattern
/// Returns the <see cref="LoggingEvent.LoggerName"/> of the <paramref name="loggingEvent"/>.
/// </para>
/// </remarks>
- override protected string GetFullyQualifiedName(LoggingEvent loggingEvent)
+ protected override string GetFullyQualifiedName(LoggingEvent loggingEvent)
{
return loggingEvent.LoggerName;
}
diff --git a/src/log4net/Layout/Pattern/MessagePatternConverter.cs b/src/log4net/Layout/Pattern/MessagePatternConverter.cs
index 43d13fe..cf0f5af 100644
--- a/src/log4net/Layout/Pattern/MessagePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/MessagePatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// to write out the event message.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
loggingEvent.WriteRenderedMessage(writer);
}
diff --git a/src/log4net/Layout/Pattern/MethodLocationPatternConverter.cs b/src/log4net/Layout/Pattern/MethodLocationPatternConverter.cs
index a0537ad..90fa755 100644
--- a/src/log4net/Layout/Pattern/MethodLocationPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/MethodLocationPatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// the output.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.LocationInformation.MethodName);
}
diff --git a/src/log4net/Layout/Pattern/NamedPatternConverter.cs b/src/log4net/Layout/Pattern/NamedPatternConverter.cs
index 8338706..d94a9c8 100644
--- a/src/log4net/Layout/Pattern/NamedPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/NamedPatternConverter.cs
@@ -109,7 +109,7 @@ namespace log4net.Layout.Pattern
/// Return the fully qualified <c>'.'</c> (dot/period) separated string.
/// </para>
/// </remarks>
- abstract protected string GetFullyQualifiedName(LoggingEvent loggingEvent);
+ protected abstract string GetFullyQualifiedName(LoggingEvent loggingEvent);
/// <summary>
/// Convert the pattern to the rendered message
@@ -120,7 +120,7 @@ namespace log4net.Layout.Pattern
/// Render the <see cref="GetFullyQualifiedName"/> to the precision
/// specified by the <see cref="PatternConverter.Option"/> property.
/// </remarks>
- sealed override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected sealed override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
string name = GetFullyQualifiedName(loggingEvent);
if (m_precision <= 0 || name == null || name.Length < 2)
@@ -163,7 +163,7 @@ namespace log4net.Layout.Pattern
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(NamedPatternConverter);
+ private static readonly Type declaringType = typeof(NamedPatternConverter);
private const string DOT = ".";
#endregion Private Static Fields
diff --git a/src/log4net/Layout/Pattern/NdcPatternConverter.cs b/src/log4net/Layout/Pattern/NdcPatternConverter.cs
index 947fb12..5721681 100644
--- a/src/log4net/Layout/Pattern/NdcPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/NdcPatternConverter.cs
@@ -53,7 +53,7 @@ namespace log4net.Layout.Pattern
/// The <see cref="PropertyPatternConverter"/> should be used instead.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
// Write the value for the specified key
WriteObject(writer, loggingEvent.Repository, loggingEvent.LookupProperty("NDC"));
diff --git a/src/log4net/Layout/Pattern/PatternLayoutConverter.cs b/src/log4net/Layout/Pattern/PatternLayoutConverter.cs
index f0ed36f..b805b39 100644
--- a/src/log4net/Layout/Pattern/PatternLayoutConverter.cs
+++ b/src/log4net/Layout/Pattern/PatternLayoutConverter.cs
@@ -69,7 +69,7 @@ namespace log4net.Layout.Pattern
/// value is <c>true</c>, this converter does not handle the exception.
/// </para>
/// </remarks>
- virtual public bool IgnoresException
+ public virtual bool IgnoresException
{
get { return m_ignoresException; }
set { m_ignoresException = value; }
@@ -85,7 +85,7 @@ namespace log4net.Layout.Pattern
/// </summary>
/// <param name="writer"><see cref="TextWriter" /> that will receive the formatted result.</param>
/// <param name="loggingEvent">The <see cref="LoggingEvent" /> on which the pattern converter should be executed.</param>
- abstract protected void Convert(TextWriter writer, LoggingEvent loggingEvent);
+ protected abstract void Convert(TextWriter writer, LoggingEvent loggingEvent);
#endregion Protected Abstract Methods
@@ -97,7 +97,7 @@ namespace log4net.Layout.Pattern
/// </summary>
/// <param name="writer"><see cref="TextWriter" /> that will receive the formatted result.</param>
/// <param name="state">The state object on which the pattern converter should be executed.</param>
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
LoggingEvent loggingEvent = state as LoggingEvent;
if (loggingEvent != null)
diff --git a/src/log4net/Layout/Pattern/PropertyPatternConverter.cs b/src/log4net/Layout/Pattern/PropertyPatternConverter.cs
index f2d9e37..44a096b 100644
--- a/src/log4net/Layout/Pattern/PropertyPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/PropertyPatternConverter.cs
@@ -60,7 +60,7 @@ namespace log4net.Layout.Pattern
/// then all the properties are written as key value pairs.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
if (Option != null)
{
diff --git a/src/log4net/Layout/Pattern/RelativeTimePatternConverter.cs b/src/log4net/Layout/Pattern/RelativeTimePatternConverter.cs
index a5d3495..01b9ae2 100644
--- a/src/log4net/Layout/Pattern/RelativeTimePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/RelativeTimePatternConverter.cs
@@ -48,7 +48,7 @@ namespace log4net.Layout.Pattern
/// and the <see cref="LoggingEvent.StartTime"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write( TimeDifferenceInMillis(LoggingEvent.StartTimeUtc, loggingEvent.TimeStampUtc).ToString(System.Globalization.NumberFormatInfo.InvariantInfo) );
}
diff --git a/src/log4net/Layout/Pattern/StackTraceDetailPatternConverter.cs b/src/log4net/Layout/Pattern/StackTraceDetailPatternConverter.cs
index 47be2dc..9e020cb 100644
--- a/src/log4net/Layout/Pattern/StackTraceDetailPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/StackTraceDetailPatternConverter.cs
@@ -82,7 +82,7 @@ namespace log4net.Layout.Pattern
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(StackTracePatternConverter);
+ private static readonly Type declaringType = typeof(StackTracePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Layout/Pattern/StackTracePatternConverter.cs b/src/log4net/Layout/Pattern/StackTracePatternConverter.cs
index de67e63..7773868 100644
--- a/src/log4net/Layout/Pattern/StackTracePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/StackTracePatternConverter.cs
@@ -92,7 +92,7 @@ namespace log4net.Layout.Pattern
/// Writes the <see cref="LocationInfo.StackFrames"/> to the output writer.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
StackFrameItem[] stackframes = loggingEvent.LocationInformation.StackFrames;
if ((stackframes == null) || (stackframes.Length <= 0))
@@ -141,7 +141,7 @@ namespace log4net.Layout.Pattern
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(StackTracePatternConverter);
+ private static readonly Type declaringType = typeof(StackTracePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Layout/Pattern/ThreadPatternConverter.cs b/src/log4net/Layout/Pattern/ThreadPatternConverter.cs
index c306a37..122c361 100644
--- a/src/log4net/Layout/Pattern/ThreadPatternConverter.cs
+++ b/src/log4net/Layout/Pattern/ThreadPatternConverter.cs
@@ -46,7 +46,7 @@ namespace log4net.Layout.Pattern
/// Writes the <see cref="LoggingEvent.ThreadName"/> to the <paramref name="writer" />.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write(loggingEvent.ThreadName);
}
diff --git a/src/log4net/Layout/Pattern/TypeNamePatternConverter.cs b/src/log4net/Layout/Pattern/TypeNamePatternConverter.cs
index acca1cb..8b5fce8 100644
--- a/src/log4net/Layout/Pattern/TypeNamePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/TypeNamePatternConverter.cs
@@ -46,7 +46,7 @@ namespace log4net.Layout.Pattern
/// Returns the <see cref="LocationInfo.ClassName"/> of the <paramref name="loggingEvent"/>.
/// </para>
/// </remarks>
- override protected string GetFullyQualifiedName(LoggingEvent loggingEvent)
+ protected override string GetFullyQualifiedName(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Layout/Pattern/UserNamePatternConverter.cs b/src/log4net/Layout/Pattern/UserNamePatternConverter.cs
index 8c0518f..1f64c0c 100644
--- a/src/log4net/Layout/Pattern/UserNamePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/UserNamePatternConverter.cs
@@ -37,7 +37,7 @@ namespace log4net.Layout.Pattern
/// </summary>
/// <param name="writer"><see cref="TextWriter" /> that will receive the formatted result.</param>
/// <param name="loggingEvent">the event being logged</param>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
writer.Write( loggingEvent.UserName );
}
diff --git a/src/log4net/Layout/Pattern/UtcDatePatternConverter.cs b/src/log4net/Layout/Pattern/UtcDatePatternConverter.cs
index 41caf28..95227f7 100644
--- a/src/log4net/Layout/Pattern/UtcDatePatternConverter.cs
+++ b/src/log4net/Layout/Pattern/UtcDatePatternConverter.cs
@@ -63,7 +63,7 @@ namespace log4net.Layout.Pattern
/// </para>
/// </remarks>
/// <seealso cref="DatePatternConverter"/>
- override protected void Convert(TextWriter writer, LoggingEvent loggingEvent)
+ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
{
try
{
@@ -84,7 +84,7 @@ namespace log4net.Layout.Pattern
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(UtcDatePatternConverter);
+ private static readonly Type declaringType = typeof(UtcDatePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Layout/PatternLayout.cs b/src/log4net/Layout/PatternLayout.cs
index 6e49bfd..49cad59 100644
--- a/src/log4net/Layout/PatternLayout.cs
+++ b/src/log4net/Layout/PatternLayout.cs
@@ -1019,7 +1019,7 @@ namespace log4net.Layout
/// global and instance rules on the <see cref="PatternParser"/>.
/// </para>
/// </remarks>
- virtual protected PatternParser CreatePatternParser(string pattern)
+ protected virtual PatternParser CreatePatternParser(string pattern)
{
PatternParser patternParser = new PatternParser(pattern);
@@ -1058,7 +1058,7 @@ namespace log4net.Layout
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
m_head = CreatePatternParser(m_pattern).Parse();
@@ -1095,7 +1095,7 @@ namespace log4net.Layout
/// specified in the <see cref="ConversionPattern"/> property.
/// </para>
/// </remarks>
- override public void Format(TextWriter writer, LoggingEvent loggingEvent)
+ public override void Format(TextWriter writer, LoggingEvent loggingEvent)
{
if (writer == null)
{
diff --git a/src/log4net/Layout/SimpleLayout.cs b/src/log4net/Layout/SimpleLayout.cs
index b330ee7..5efe0d0 100644
--- a/src/log4net/Layout/SimpleLayout.cs
+++ b/src/log4net/Layout/SimpleLayout.cs
@@ -72,7 +72,7 @@ namespace log4net.Layout
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
// nothing to do.
}
@@ -93,7 +93,7 @@ namespace log4net.Layout
/// output is terminated by a newline.
/// </para>
/// </remarks>
- override public void Format(TextWriter writer, LoggingEvent loggingEvent)
+ public override void Format(TextWriter writer, LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
diff --git a/src/log4net/Layout/XmlLayout.cs b/src/log4net/Layout/XmlLayout.cs
index 61e366e..66b7dcf 100644
--- a/src/log4net/Layout/XmlLayout.cs
+++ b/src/log4net/Layout/XmlLayout.cs
@@ -184,7 +184,7 @@ namespace log4net.Layout
/// Builds a cache of the element names
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
base.ActivateOptions();
@@ -215,7 +215,7 @@ namespace log4net.Layout
/// to write the <see cref="LoggingEvent"/> to the <see cref="XmlWriter"/>.
/// </para>
/// </remarks>
- override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent)
+ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent)
{
writer.WriteStartElement(m_elmEvent);
writer.WriteAttributeString(ATTR_LOGGER, loggingEvent.LoggerName);
diff --git a/src/log4net/Layout/XmlLayoutBase.cs b/src/log4net/Layout/XmlLayoutBase.cs
index c046bc0..2f35f8b 100644
--- a/src/log4net/Layout/XmlLayoutBase.cs
+++ b/src/log4net/Layout/XmlLayoutBase.cs
@@ -41,7 +41,7 @@ namespace log4net.Layout
/// </remarks>
/// <author>Nicko Cadell</author>
/// <author>Gert Driesen</author>
- abstract public class XmlLayoutBase : LayoutSkeleton
+ public abstract class XmlLayoutBase : LayoutSkeleton
{
#region Protected Instance Constructors
@@ -149,7 +149,7 @@ namespace log4net.Layout
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- override public void ActivateOptions()
+ public override void ActivateOptions()
{
// nothing to do
}
@@ -169,7 +169,7 @@ namespace log4net.Layout
/// As this is the XML layout, the value is always <c>"text/xml"</c>.
/// </para>
/// </remarks>
- override public string ContentType
+ public override string ContentType
{
get { return "text/xml"; }
}
@@ -190,7 +190,7 @@ namespace log4net.Layout
/// <see cref="FormatXml"/> method rather than this method.
/// </para>
/// </remarks>
- override public void Format(TextWriter writer, LoggingEvent loggingEvent)
+ public override void Format(TextWriter writer, LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
@@ -233,7 +233,7 @@ namespace log4net.Layout
/// the <see cref="LoggingEvent"/> as XML.
/// </para>
/// </remarks>
- abstract protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent);
+ protected abstract void FormatXml(XmlWriter writer, LoggingEvent loggingEvent);
#endregion Protected Instance Methods
diff --git a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs
index b479102..fe66d59 100644
--- a/src/log4net/Layout/XmlLayoutSchemaLog4j.cs
+++ b/src/log4net/Layout/XmlLayoutSchemaLog4j.cs
@@ -136,7 +136,7 @@ method="run" file="Generator.java" line="94"/>
/// Generate XML that is compatible with the log4j schema.
/// </para>
/// </remarks>
- override protected void FormatXml(XmlWriter writer, LoggingEvent loggingEvent)
+ protected override void FormatXml(XmlWriter writer, LoggingEvent loggingEvent)
{
// Translate logging events for log4j
diff --git a/src/log4net/LogicalThreadContext.cs b/src/log4net/LogicalThreadContext.cs
index da99eb1..937f952 100644
--- a/src/log4net/LogicalThreadContext.cs
+++ b/src/log4net/LogicalThreadContext.cs
@@ -139,12 +139,12 @@ namespace log4net
/// <summary>
/// The thread context properties instance
/// </summary>
- private readonly static LogicalThreadContextProperties s_properties = new LogicalThreadContextProperties();
+ private static readonly LogicalThreadContextProperties s_properties = new LogicalThreadContextProperties();
/// <summary>
/// The thread context stacks instance
/// </summary>
- private readonly static LogicalThreadContextStacks s_stacks = new LogicalThreadContextStacks(s_properties);
+ private static readonly LogicalThreadContextStacks s_stacks = new LogicalThreadContextStacks(s_properties);
#endregion Private Static Fields
}
diff --git a/src/log4net/ObjectRenderer/RendererMap.cs b/src/log4net/ObjectRenderer/RendererMap.cs
index 666dfda..c785e27 100644
--- a/src/log4net/ObjectRenderer/RendererMap.cs
+++ b/src/log4net/ObjectRenderer/RendererMap.cs
@@ -45,7 +45,7 @@ namespace log4net.ObjectRenderer
/// <author>Gert Driesen</author>
public class RendererMap
{
- private readonly static Type declaringType = typeof(RendererMap);
+ private static readonly Type declaringType = typeof(RendererMap);
#region Member Variables
diff --git a/src/log4net/Plugin/RemoteLoggingServerPlugin.cs b/src/log4net/Plugin/RemoteLoggingServerPlugin.cs
index 7305ef5..ff5824b 100644
--- a/src/log4net/Plugin/RemoteLoggingServerPlugin.cs
+++ b/src/log4net/Plugin/RemoteLoggingServerPlugin.cs
@@ -123,7 +123,7 @@ namespace log4net.Plugin
#if NET_4_0 || MONO_4_0
[System.Security.SecuritySafeCritical]
#endif
- override public void Attach(ILoggerRepository repository)
+ public override void Attach(ILoggerRepository repository)
{
base.Attach(repository);
@@ -152,7 +152,7 @@ namespace log4net.Plugin
#if NET_4_0 || MONO_4_0
[System.Security.SecuritySafeCritical]
#endif
- override public void Shutdown()
+ public override void Shutdown()
{
// Stops the sink from receiving messages
RemotingServices.Disconnect(m_sink);
@@ -179,7 +179,7 @@ namespace log4net.Plugin
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(RemoteLoggingServerPlugin);
+ private static readonly Type declaringType = typeof(RemoteLoggingServerPlugin);
#endregion Private Static Fields
diff --git a/src/log4net/Repository/Hierarchy/Hierarchy.cs b/src/log4net/Repository/Hierarchy/Hierarchy.cs
index 0f4138f..c21d09a 100644
--- a/src/log4net/Repository/Hierarchy/Hierarchy.cs
+++ b/src/log4net/Repository/Hierarchy/Hierarchy.cs
@@ -290,7 +290,7 @@ namespace log4net.Repository.Hierarchy
/// its reference, otherwise returns <c>null</c>.
/// </para>
/// </remarks>
- override public ILogger Exists(string name)
+ public override ILogger Exists(string name)
{
if (name == null)
{
@@ -314,7 +314,7 @@ namespace log4net.Repository.Hierarchy
/// enumeration.
/// </para>
/// </remarks>
- override public ILogger[] GetCurrentLoggers()
+ public override ILogger[] GetCurrentLoggers()
{
// The accumulation in loggers is necessary because not all elements in
// ht are Logger objects as there might be some ProvisionNodes
@@ -352,7 +352,7 @@ namespace log4net.Repository.Hierarchy
/// </remarks>
/// <param name="name">The name of the logger to retrieve</param>
/// <returns>The logger object with the name specified</returns>
- override public ILogger GetLogger(string name)
+ public override ILogger GetLogger(string name)
{
if (name == null)
{
@@ -383,7 +383,7 @@ namespace log4net.Repository.Hierarchy
/// and again to a nested appender.
/// </para>
/// </remarks>
- override public void Shutdown()
+ public override void Shutdown()
{
LogLog.Debug(declaringType, "Shutdown called on Hierarchy ["+this.Name+"]");
@@ -431,7 +431,7 @@ namespace log4net.Repository.Hierarchy
/// block all logging until it is completed.
/// </para>
/// </remarks>
- override public void ResetConfiguration()
+ public override void ResetConfiguration()
{
Root.Level = LevelMap.LookupWithDefault(Level.Debug);
Threshold = LevelMap.LookupWithDefault(Level.All);
@@ -470,7 +470,7 @@ namespace log4net.Repository.Hierarchy
/// that logger is then responsible for logging the event.
/// </para>
/// </remarks>
- override public void Log(LoggingEvent logEvent)
+ public override void Log(LoggingEvent logEvent)
{
if (logEvent == null)
{
@@ -494,7 +494,7 @@ namespace log4net.Repository.Hierarchy
/// The list returned is unordered but does not contain duplicates.
/// </para>
/// </remarks>
- override public Appender.IAppender[] GetAppenders()
+ public override Appender.IAppender[] GetAppenders()
{
System.Collections.ArrayList appenderList = new System.Collections.ArrayList();
@@ -1079,7 +1079,7 @@ namespace log4net.Repository.Hierarchy
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(Hierarchy);
+ private static readonly Type declaringType = typeof(Hierarchy);
#endregion Private Static Fields
}
diff --git a/src/log4net/Repository/Hierarchy/Logger.cs b/src/log4net/Repository/Hierarchy/Logger.cs
index c7a081d..839e688 100644
--- a/src/log4net/Repository/Hierarchy/Logger.cs
+++ b/src/log4net/Repository/Hierarchy/Logger.cs
@@ -96,7 +96,7 @@ namespace log4net.Repository.Hierarchy
/// The hierarchy is parent linked rather than child linked.
/// </para>
/// </remarks>
- virtual public Logger Parent
+ public virtual Logger Parent
{
get { return m_parent; }
set { m_parent = value; }
@@ -119,7 +119,7 @@ namespace log4net.Repository.Hierarchy
/// the user manual for more details.
/// </para>
/// </remarks>
- virtual public bool Additivity
+ public virtual bool Additivity
{
get { return m_additive; }
set { m_additive = value; }
@@ -138,7 +138,7 @@ namespace log4net.Repository.Hierarchy
/// <para>The Logger class is designed so that this method executes as
/// quickly as possible.</para>
/// </remarks>
- virtual public Level EffectiveLevel
+ public virtual Level EffectiveLevel
{
get
{
@@ -166,7 +166,7 @@ namespace log4net.Repository.Hierarchy
/// This logger must be attached to a single <see cref="Hierarchy"/>.
/// </para>
/// </remarks>
- virtual public Hierarchy Hierarchy
+ public virtual Hierarchy Hierarchy
{
get { return m_hierarchy; }
set { m_hierarchy = value; }
@@ -183,7 +183,7 @@ namespace log4net.Repository.Hierarchy
/// The assigned <see cref="Level"/> can be <c>null</c>.
/// </para>
/// </remarks>
- virtual public Level Level
+ public virtual Level Level
{
get { return m_level; }
set { m_level = value; }
@@ -208,7 +208,7 @@ namespace log4net.Repository.Hierarchy
/// appenders, then it won't be added again.
/// </para>
/// </remarks>
- virtual public void AddAppender(IAppender newAppender)
+ public virtual void AddAppender(IAppender newAppender)
{
if (newAppender == null)
{
@@ -242,7 +242,7 @@ namespace log4net.Repository.Hierarchy
/// can be found, then a <see cref="EmptyCollection"/> is returned.
/// </para>
/// </remarks>
- virtual public AppenderCollection Appenders
+ public virtual AppenderCollection Appenders
{
get
{
@@ -275,7 +275,7 @@ namespace log4net.Repository.Hierarchy
/// Returns the named appender, or null if the appender is not found.
/// </para>
/// </remarks>
- virtual public IAppender GetAppender(string name)
+ public virtual IAppender GetAppender(string name)
{
m_appenderLock.AcquireReaderLock();
try
@@ -304,7 +304,7 @@ namespace log4net.Repository.Hierarchy
/// This is useful when re-reading configuration information.
/// </para>
/// </remarks>
- virtual public void RemoveAllAppenders()
+ public virtual void RemoveAllAppenders()
{
m_appenderLock.AcquireWriterLock();
try
@@ -334,7 +334,7 @@ namespace log4net.Repository.Hierarchy
/// <see cref="IAppender.Close"/> on the appender removed.
/// </para>
/// </remarks>
- virtual public IAppender RemoveAppender(IAppender appender)
+ public virtual IAppender RemoveAppender(IAppender appender)
{
m_appenderLock.AcquireWriterLock();
try
@@ -364,7 +364,7 @@ namespace log4net.Repository.Hierarchy
/// <see cref="IAppender.Close"/> on the appender removed.
/// </para>
/// </remarks>
- virtual public IAppender RemoveAppender(string name)
+ public virtual IAppender RemoveAppender(string name)
{
m_appenderLock.AcquireWriterLock();
try
@@ -396,7 +396,7 @@ namespace log4net.Repository.Hierarchy
/// The name of this logger
/// </para>
/// </remarks>
- virtual public string Name
+ public virtual string Name
{
get { return m_name; }
}
@@ -418,7 +418,7 @@ namespace log4net.Repository.Hierarchy
/// This method must not throw any exception to the caller.
/// </para>
/// </remarks>
- virtual public void Log(Type callerStackBoundaryDeclaringType, Level level, object message, Exception exception)
+ public virtual void Log(Type callerStackBoundaryDeclaringType, Level level, object message, Exception exception)
{
try
{
@@ -452,7 +452,7 @@ namespace log4net.Repository.Hierarchy
/// This method must not throw any exception to the caller.
/// </para>
/// </remarks>
- virtual public void Log(LoggingEvent logEvent)
+ public virtual void Log(LoggingEvent logEvent)
{
try
{
@@ -491,7 +491,7 @@ namespace log4net.Repository.Hierarchy
/// This method must not throw any exception to the caller.
/// </para>
/// </remarks>
- virtual public bool IsEnabledFor(Level level)
+ public virtual bool IsEnabledFor(Level level)
{
try
{
@@ -553,7 +553,7 @@ namespace log4net.Repository.Hierarchy
/// to log the particular log request.
/// </para>
/// </remarks>
- virtual protected void CallAppenders(LoggingEvent loggingEvent)
+ protected virtual void CallAppenders(LoggingEvent loggingEvent)
{
if (loggingEvent == null)
{
@@ -625,7 +625,7 @@ namespace log4net.Repository.Hierarchy
/// Used to ensure that the appenders are correctly shutdown.
/// </para>
/// </remarks>
- virtual public void CloseNestedAppenders()
+ public virtual void CloseNestedAppenders()
{
m_appenderLock.AcquireWriterLock();
try
@@ -660,7 +660,7 @@ namespace log4net.Repository.Hierarchy
/// the <paramref name="message"/>.
/// </para>
/// </remarks>
- virtual public void Log(Level level, object message, Exception exception)
+ public virtual void Log(Level level, object message, Exception exception)
{
if (IsEnabledFor(level))
{
@@ -682,7 +682,7 @@ namespace log4net.Repository.Hierarchy
/// appenders.
/// </para>
/// </remarks>
- virtual protected void ForcedLog(Type callerStackBoundaryDeclaringType, Level level, object message, Exception exception)
+ protected virtual void ForcedLog(Type callerStackBoundaryDeclaringType, Level level, object message, Exception exception)
{
CallAppenders(new LoggingEvent(callerStackBoundaryDeclaringType, this.Hierarchy, this.Name, level, message, exception));
}
@@ -696,7 +696,7 @@ namespace log4net.Repository.Hierarchy
/// Delivers the logging event to the attached appenders.
/// </para>
/// </remarks>
- virtual protected void ForcedLog(LoggingEvent logEvent)
+ protected virtual void ForcedLog(LoggingEvent logEvent)
{
// The logging event may not have been created by this logger
// the Repository may not be correctly set on the event. This
@@ -711,7 +711,7 @@ namespace log4net.Repository.Hierarchy
/// <summary>
/// The fully qualified type of the Logger class.
/// </summary>
- private readonly static Type declaringType = typeof(Logger);
+ private static readonly Type declaringType = typeof(Logger);
#endregion Private Static Fields
diff --git a/src/log4net/Repository/Hierarchy/LoggerKey.cs b/src/log4net/Repository/Hierarchy/LoggerKey.cs
index ccc566b..1485417 100644
--- a/src/log4net/Repository/Hierarchy/LoggerKey.cs
+++ b/src/log4net/Repository/Hierarchy/LoggerKey.cs
@@ -86,7 +86,7 @@ namespace log4net.Repository.Hierarchy
/// Returns the cached hashcode.
/// </para>
/// </remarks>
- override public int GetHashCode()
+ public override int GetHashCode()
{
return m_hashCache;
}
@@ -104,7 +104,7 @@ namespace log4net.Repository.Hierarchy
/// Compares the references of the interned strings.
/// </para>
/// </remarks>
- override public bool Equals(object obj)
+ public override bool Equals(object obj)
{
// Compare reference type of this against argument
if (((object)this) == obj)
diff --git a/src/log4net/Repository/Hierarchy/RootLogger.cs b/src/log4net/Repository/Hierarchy/RootLogger.cs
index e178bb7..8184e3f 100644
--- a/src/log4net/Repository/Hierarchy/RootLogger.cs
+++ b/src/log4net/Repository/Hierarchy/RootLogger.cs
@@ -79,7 +79,7 @@ namespace log4net.Repository.Hierarchy
/// value of <see cref="Logger.Level"/>.
/// </para>
/// </remarks>
- override public Level EffectiveLevel
+ public override Level EffectiveLevel
{
get
{
@@ -99,7 +99,7 @@ namespace log4net.Repository.Hierarchy
/// may have catastrophic results. We prevent this here.
/// </para>
/// </remarks>
- override public Level Level
+ public override Level Level
{
get { return base.Level; }
set
@@ -126,7 +126,7 @@ namespace log4net.Repository.Hierarchy
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(RootLogger);
+ private static readonly Type declaringType = typeof(RootLogger);
#endregion Private Static Fields
}
diff --git a/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs b/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs
index d2e53ee..bc2561d 100644
--- a/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs
+++ b/src/log4net/Repository/Hierarchy/XmlHierarchyConfigurator.cs
@@ -1156,7 +1156,7 @@ namespace log4net.Repository.Hierarchy
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(XmlHierarchyConfigurator);
+ private static readonly Type declaringType = typeof(XmlHierarchyConfigurator);
#endregion Private Static Fields
}
diff --git a/src/log4net/Repository/LoggerRepositorySkeleton.cs b/src/log4net/Repository/LoggerRepositorySkeleton.cs
index e4f06f8..9a2a69c 100644
--- a/src/log4net/Repository/LoggerRepositorySkeleton.cs
+++ b/src/log4net/Repository/LoggerRepositorySkeleton.cs
@@ -114,7 +114,7 @@ namespace log4net.Repository
/// stored by the <see cref="IRepositorySelector"/>.
/// </para>
/// </remarks>
- virtual public string Name
+ public virtual string Name
{
get { return m_name; }
set { m_name = value; }
@@ -131,7 +131,7 @@ namespace log4net.Repository
/// The threshold for all events in this repository
/// </para>
/// </remarks>
- virtual public Level Threshold
+ public virtual Level Threshold
{
get { return m_threshold; }
set
@@ -164,7 +164,7 @@ namespace log4net.Repository
/// <see cref="IObjectRenderer"/> objects.
/// </para>
/// </remarks>
- virtual public RendererMap RendererMap
+ public virtual RendererMap RendererMap
{
get { return m_rendererMap; }
}
@@ -181,7 +181,7 @@ namespace log4net.Repository
/// that have been attached to this repository.
/// </para>
/// </remarks>
- virtual public PluginMap PluginMap
+ public virtual PluginMap PluginMap
{
get { return m_pluginMap; }
}
@@ -199,7 +199,7 @@ namespace log4net.Repository
/// this repository.
/// </para>
/// </remarks>
- virtual public LevelMap LevelMap
+ public virtual LevelMap LevelMap
{
get { return m_levelMap; }
}
@@ -215,7 +215,7 @@ namespace log4net.Repository
/// its reference, otherwise returns <c>null</c>.
/// </para>
/// </remarks>
- abstract public ILogger Exists(string name);
+ public abstract ILogger Exists(string name);
/// <summary>
/// Returns all the currently defined loggers in the repository
@@ -226,7 +226,7 @@ namespace log4net.Repository
/// Returns all the currently defined loggers in the repository as an Array.
/// </para>
/// </remarks>
- abstract public ILogger[] GetCurrentLoggers();
+ public abstract ILogger[] GetCurrentLoggers();
/// <summary>
/// Return a new logger instance
@@ -243,7 +243,7 @@ namespace log4net.Repository
/// then linked with its existing ancestors as well as children.
/// </para>
/// </remarks>
- abstract public ILogger GetLogger(string name);
+ public abstract ILogger GetLogger(string name);
/// <summary>
/// Shutdown the repository
@@ -255,7 +255,7 @@ namespace log4net.Repository
/// listeners and all attached plugins of the shutdown event.
/// </para>
/// </remarks>
- virtual public void Shutdown()
+ public virtual void Shutdown()
{
// Shutdown attached plugins
foreach(IPlugin plugin in PluginMap.AllPlugins)
@@ -283,7 +283,7 @@ namespace log4net.Repository
/// block all logging until it is completed.
/// </para>
/// </remarks>
- virtual public void ResetConfiguration()
+ public virtual void ResetConfiguration()
{
// Clear internal data structures
m_rendererMap.Clear();
@@ -315,7 +315,7 @@ namespace log4net.Repository
/// that logger is then responsible for logging the event.
/// </para>
/// </remarks>
- abstract public void Log(LoggingEvent logEvent);
+ public abstract void Log(LoggingEvent logEvent);
/// <summary>
/// Flag indicates if this repository has been configured.
@@ -328,7 +328,7 @@ namespace log4net.Repository
/// Flag indicates if this repository has been configured.
/// </para>
/// </remarks>
- virtual public bool Configured
+ public virtual bool Configured
{
get { return m_configured; }
set { m_configured = value; }
@@ -338,7 +338,7 @@ namespace log4net.Repository
/// Contains a list of internal messages captures during the
/// last configuration.
/// </summary>
- virtual public ICollection ConfigurationMessages
+ public virtual ICollection ConfigurationMessages
{
get { return m_configurationMessages; }
set { m_configurationMessages = value; }
@@ -419,7 +419,7 @@ namespace log4net.Repository
/// Returns all the Appenders that are configured as an Array.
/// </para>
/// </remarks>
- abstract public log4net.Appender.IAppender[] GetAppenders();
+ public abstract log4net.Appender.IAppender[] GetAppenders();
#endregion
@@ -432,7 +432,7 @@ namespace log4net.Repository
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(LoggerRepositorySkeleton);
+ private static readonly Type declaringType = typeof(LoggerRepositorySkeleton);
#endregion Private Static Fields
@@ -477,7 +477,7 @@ namespace log4net.Repository
/// Adds an object renderer for a specific class.
/// </para>
/// </remarks>
- virtual public void AddRenderer(Type typeToRender, IObjectRenderer rendererInstance)
+ public virtual void AddRenderer(Type typeToRender, IObjectRenderer rendererInstance)
{
if (typeToRender == null)
{
diff --git a/src/log4net/ThreadContext.cs b/src/log4net/ThreadContext.cs
index 9d668f7..4da972c 100644
--- a/src/log4net/ThreadContext.cs
+++ b/src/log4net/ThreadContext.cs
@@ -127,12 +127,12 @@ namespace log4net
/// <summary>
/// The thread context properties instance
/// </summary>
- private readonly static ThreadContextProperties s_properties = new ThreadContextProperties();
+ private static readonly ThreadContextProperties s_properties = new ThreadContextProperties();
/// <summary>
/// The thread context stacks instance
/// </summary>
- private readonly static ThreadContextStacks s_stacks = new ThreadContextStacks(s_properties);
+ private static readonly ThreadContextStacks s_stacks = new ThreadContextStacks(s_properties);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/AppenderAttachedImpl.cs b/src/log4net/Util/AppenderAttachedImpl.cs
index fafb0b8..3508048 100644
--- a/src/log4net/Util/AppenderAttachedImpl.cs
+++ b/src/log4net/Util/AppenderAttachedImpl.cs
@@ -369,7 +369,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(AppenderAttachedImpl);
+ private static readonly Type declaringType = typeof(AppenderAttachedImpl);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/CountingQuietTextWriter.cs b/src/log4net/Util/CountingQuietTextWriter.cs
index aa2947a..e0c2925 100644
--- a/src/log4net/Util/CountingQuietTextWriter.cs
+++ b/src/log4net/Util/CountingQuietTextWriter.cs
@@ -126,7 +126,7 @@ namespace log4net.Util
/// the number of bytes written.
/// </para>
/// </remarks>
- override public void Write(string str)
+ public override void Write(string str)
{
if (str != null && str.Length > 0)
{
diff --git a/src/log4net/Util/EmptyCollection.cs b/src/log4net/Util/EmptyCollection.cs
index ad5f1d8..1222587 100644
--- a/src/log4net/Util/EmptyCollection.cs
+++ b/src/log4net/Util/EmptyCollection.cs
@@ -171,7 +171,7 @@ namespace log4net.Util
/// <summary>
/// The singleton instance of the empty collection.
/// </summary>
- private readonly static EmptyCollection s_instance = new EmptyCollection();
+ private static readonly EmptyCollection s_instance = new EmptyCollection();
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/EmptyDictionary.cs b/src/log4net/Util/EmptyDictionary.cs
index 2c9192d..792a781 100644
--- a/src/log4net/Util/EmptyDictionary.cs
+++ b/src/log4net/Util/EmptyDictionary.cs
@@ -332,7 +332,7 @@ namespace log4net.Util
/// <summary>
/// The singleton instance of the empty dictionary.
/// </summary>
- private readonly static EmptyDictionary s_instance = new EmptyDictionary();
+ private static readonly EmptyDictionary s_instance = new EmptyDictionary();
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/GlobalContextProperties.cs b/src/log4net/Util/GlobalContextProperties.cs
index b643107..0c19995 100644
--- a/src/log4net/Util/GlobalContextProperties.cs
+++ b/src/log4net/Util/GlobalContextProperties.cs
@@ -93,7 +93,7 @@ namespace log4net.Util
/// the properties is created.
/// </para>
/// </remarks>
- override public object this[string key]
+ public override object this[string key]
{
get
{
diff --git a/src/log4net/Util/ILogExtensions.cs b/src/log4net/Util/ILogExtensions.cs
index 9aa6a61..fa52c28 100644
--- a/src/log4net/Util/ILogExtensions.cs
+++ b/src/log4net/Util/ILogExtensions.cs
@@ -53,7 +53,7 @@ namespace log4net.Util
/// <summary>
/// The fully qualified type of the Logger class.
/// </summary>
- private readonly static Type declaringType = typeof(ILogExtensions);
+ private static readonly Type declaringType = typeof(ILogExtensions);
#endregion //Private Static Fields
diff --git a/src/log4net/Util/LevelMappingEntry.cs b/src/log4net/Util/LevelMappingEntry.cs
index bfed35b..1a3975b 100644
--- a/src/log4net/Util/LevelMappingEntry.cs
+++ b/src/log4net/Util/LevelMappingEntry.cs
@@ -84,7 +84,7 @@ namespace log4net.Util
/// Should be overridden by any classes that need to initialise based on their options
/// </para>
/// </remarks>
- virtual public void ActivateOptions()
+ public virtual void ActivateOptions()
{
// default implementation is to do nothing
}
diff --git a/src/log4net/Util/LogicalThreadContextProperties.cs b/src/log4net/Util/LogicalThreadContextProperties.cs
index 519efe4..179c22b 100644
--- a/src/log4net/Util/LogicalThreadContextProperties.cs
+++ b/src/log4net/Util/LogicalThreadContextProperties.cs
@@ -99,7 +99,7 @@ namespace log4net.Util
/// Get or set the property value for the <paramref name="key"/> specified.
/// </para>
/// </remarks>
- override public object this[string key]
+ public override object this[string key]
{
get
{
@@ -273,7 +273,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(LogicalThreadContextProperties);
+ private static readonly Type declaringType = typeof(LogicalThreadContextProperties);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/LogicalThreadContextStacks.cs b/src/log4net/Util/LogicalThreadContextStacks.cs
index 3eccfca..7d4a225 100644
--- a/src/log4net/Util/LogicalThreadContextStacks.cs
+++ b/src/log4net/Util/LogicalThreadContextStacks.cs
@@ -133,7 +133,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(LogicalThreadContextStacks);
+ private static readonly Type declaringType = typeof(LogicalThreadContextStacks);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/NullDictionaryEnumerator.cs b/src/log4net/Util/NullDictionaryEnumerator.cs
index e4564c8..48af424 100644
--- a/src/log4net/Util/NullDictionaryEnumerator.cs
+++ b/src/log4net/Util/NullDictionaryEnumerator.cs
@@ -195,7 +195,7 @@ namespace log4net.Util
/// <summary>
/// The singleton instance of the <see cref="NullDictionaryEnumerator" />.
/// </summary>
- private readonly static NullDictionaryEnumerator s_instance = new NullDictionaryEnumerator();
+ private static readonly NullDictionaryEnumerator s_instance = new NullDictionaryEnumerator();
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/NullEnumerator.cs b/src/log4net/Util/NullEnumerator.cs
index 614d616..4cb7806 100644
--- a/src/log4net/Util/NullEnumerator.cs
+++ b/src/log4net/Util/NullEnumerator.cs
@@ -127,7 +127,7 @@ namespace log4net.Util
/// <summary>
/// The singleton instance of the <see cref="NullEnumerator" />.
/// </summary>
- private readonly static NullEnumerator s_instance = new NullEnumerator();
+ private static readonly NullEnumerator s_instance = new NullEnumerator();
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/OnlyOnceErrorHandler.cs b/src/log4net/Util/OnlyOnceErrorHandler.cs
index 8062962..5f03d92 100644
--- a/src/log4net/Util/OnlyOnceErrorHandler.cs
+++ b/src/log4net/Util/OnlyOnceErrorHandler.cs
@@ -276,7 +276,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(OnlyOnceErrorHandler);
+ private static readonly Type declaringType = typeof(OnlyOnceErrorHandler);
#endregion
}
diff --git a/src/log4net/Util/OptionConverter.cs b/src/log4net/Util/OptionConverter.cs
index c304f18..776bcc2 100644
--- a/src/log4net/Util/OptionConverter.cs
+++ b/src/log4net/Util/OptionConverter.cs
@@ -659,7 +659,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(OptionConverter);
+ private static readonly Type declaringType = typeof(OptionConverter);
private const string DELIM_START = "${";
private const char DELIM_STOP = '}';
diff --git a/src/log4net/Util/PatternConverter.cs b/src/log4net/Util/PatternConverter.cs
index 7b33395..9f9067b 100644
--- a/src/log4net/Util/PatternConverter.cs
+++ b/src/log4net/Util/PatternConverter.cs
@@ -129,7 +129,7 @@ namespace log4net.Util
/// convert conversion specifiers in the appropriate way.
/// </para>
/// </remarks>
- abstract protected void Convert(TextWriter writer, object state);
+ protected abstract void Convert(TextWriter writer, object state);
#endregion Protected Abstract Methods
@@ -165,7 +165,7 @@ namespace log4net.Util
/// apply those formattings before writing the output.
/// </para>
/// </remarks>
- virtual public void Format(TextWriter writer, object state)
+ public virtual void Format(TextWriter writer, object state)
{
if (m_min < 0 && m_max == int.MaxValue)
{
diff --git a/src/log4net/Util/PatternParser.cs b/src/log4net/Util/PatternParser.cs
index bfe4452..7dfbb32 100644
--- a/src/log4net/Util/PatternParser.cs
+++ b/src/log4net/Util/PatternParser.cs
@@ -428,7 +428,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(PatternParser);
+ private static readonly Type declaringType = typeof(PatternParser);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternString.cs b/src/log4net/Util/PatternString.cs
index 72d9ba9..c7d924b 100644
--- a/src/log4net/Util/PatternString.cs
+++ b/src/log4net/Util/PatternString.cs
@@ -390,7 +390,7 @@ namespace log4net.Util
/// <see cref="ActivateOptions"/> must be called again.
/// </para>
/// </remarks>
- virtual public void ActivateOptions()
+ public virtual void ActivateOptions()
{
m_head = CreatePatternParser(m_pattern).Parse();
}
diff --git a/src/log4net/Util/PatternStringConverters/AppDomainPatternConverter.cs b/src/log4net/Util/PatternStringConverters/AppDomainPatternConverter.cs
index 9b11002..9a20d65 100644
--- a/src/log4net/Util/PatternStringConverters/AppDomainPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/AppDomainPatternConverter.cs
@@ -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)
+ protected override void Convert(TextWriter writer, object state)
{
writer.Write( SystemInfo.ApplicationFriendlyName );
}
diff --git a/src/log4net/Util/PatternStringConverters/AppSettingPatternConverter.cs b/src/log4net/Util/PatternStringConverters/AppSettingPatternConverter.cs
index dad04c6..75d5fb0 100644
--- a/src/log4net/Util/PatternStringConverters/AppSettingPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/AppSettingPatternConverter.cs
@@ -89,7 +89,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)
+ protected override void Convert(TextWriter writer, object state)
{
if (Option != null)
diff --git a/src/log4net/Util/PatternStringConverters/DatePatternConverter.cs b/src/log4net/Util/PatternStringConverters/DatePatternConverter.cs
index 6def66f..40ffd77 100644
--- a/src/log4net/Util/PatternStringConverters/DatePatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/DatePatternConverter.cs
@@ -161,7 +161,7 @@ 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)
+ protected override void Convert(TextWriter writer, object state)
{
try
{
@@ -182,7 +182,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(DatePatternConverter);
+ private static readonly Type declaringType = typeof(DatePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs b/src/log4net/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs
index 93028a0..bd8d4b5 100644
--- a/src/log4net/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/EnvironmentFolderPathPatternConverter.cs
@@ -51,7 +51,7 @@ namespace log4net.Util.PatternStringConverters
/// property.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
try
{
@@ -89,7 +89,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(EnvironmentFolderPathPatternConverter);
+ private static readonly Type declaringType = typeof(EnvironmentFolderPathPatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/EnvironmentPatternConverter.cs b/src/log4net/Util/PatternStringConverters/EnvironmentPatternConverter.cs
index 7361f99..7085129 100644
--- a/src/log4net/Util/PatternStringConverters/EnvironmentPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/EnvironmentPatternConverter.cs
@@ -51,7 +51,7 @@ namespace log4net.Util.PatternStringConverters
/// property.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
try
{
@@ -102,7 +102,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(EnvironmentPatternConverter);
+ private static readonly Type declaringType = typeof(EnvironmentPatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/IdentityPatternConverter.cs b/src/log4net/Util/PatternStringConverters/IdentityPatternConverter.cs
index d92a292..f3ee860 100644
--- a/src/log4net/Util/PatternStringConverters/IdentityPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/IdentityPatternConverter.cs
@@ -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)
+ protected override void Convert(TextWriter writer, object state)
{
#if (NETCF || SSCLI || NETSTANDARD1_3)
// On compact framework there's no notion of current thread principals
@@ -81,7 +81,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(IdentityPatternConverter);
+ private static readonly Type declaringType = typeof(IdentityPatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/LiteralPatternConverter.cs b/src/log4net/Util/PatternStringConverters/LiteralPatternConverter.cs
index b40925a..3f3e242 100644
--- a/src/log4net/Util/PatternStringConverters/LiteralPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/LiteralPatternConverter.cs
@@ -84,7 +84,7 @@ namespace log4net.Util.PatternStringConverters
/// to the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override public void Format(TextWriter writer, object state)
+ public override 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)
+ protected override void Convert(TextWriter writer, object state)
{
throw new InvalidOperationException("Should never get here because of the overridden Format method");
}
diff --git a/src/log4net/Util/PatternStringConverters/ProcessIdPatternConverter.cs b/src/log4net/Util/PatternStringConverters/ProcessIdPatternConverter.cs
index 2dfd0cb..fbb796d 100644
--- a/src/log4net/Util/PatternStringConverters/ProcessIdPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/ProcessIdPatternConverter.cs
@@ -46,7 +46,7 @@ namespace log4net.Util.PatternStringConverters
#if NET_4_0 || MONO_4_0 || NETSTANDARD
[System.Security.SecuritySafeCritical]
#endif
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
#if (NETCF || SSCLI)
// On compact framework there is no System.Diagnostics.Process class
@@ -76,7 +76,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(ProcessIdPatternConverter);
+ private static readonly Type declaringType = typeof(ProcessIdPatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/PropertyPatternConverter.cs b/src/log4net/Util/PatternStringConverters/PropertyPatternConverter.cs
index e78611b..bf81f2a 100644
--- a/src/log4net/Util/PatternStringConverters/PropertyPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/PropertyPatternConverter.cs
@@ -57,7 +57,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)
+ protected override void Convert(TextWriter writer, object state)
{
CompositeProperties compositeProperties = new CompositeProperties();
diff --git a/src/log4net/Util/PatternStringConverters/RandomStringPatternConverter.cs b/src/log4net/Util/PatternStringConverters/RandomStringPatternConverter.cs
index dc11de9..015cfd7 100644
--- a/src/log4net/Util/PatternStringConverters/RandomStringPatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/RandomStringPatternConverter.cs
@@ -104,7 +104,7 @@ namespace log4net.Util.PatternStringConverters
/// Write a randoim string to the output <paramref name="writer"/>.
/// </para>
/// </remarks>
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
try
{
@@ -149,7 +149,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(RandomStringPatternConverter);
+ private static readonly Type declaringType = typeof(RandomStringPatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/UserNamePatternConverter.cs b/src/log4net/Util/PatternStringConverters/UserNamePatternConverter.cs
index 68aad1a..9cc69fd 100644
--- a/src/log4net/Util/PatternStringConverters/UserNamePatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/UserNamePatternConverter.cs
@@ -43,7 +43,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)
+ protected override void Convert(TextWriter writer, object state)
{
#if (NETCF || SSCLI || NETSTANDARD1_3)
// On compact framework there's no notion of current Windows user
@@ -78,7 +78,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(UserNamePatternConverter);
+ private static readonly Type declaringType = typeof(UserNamePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PatternStringConverters/UtcDatePatternConverter.cs b/src/log4net/Util/PatternStringConverters/UtcDatePatternConverter.cs
index a2bf590..31d5f7f 100644
--- a/src/log4net/Util/PatternStringConverters/UtcDatePatternConverter.cs
+++ b/src/log4net/Util/PatternStringConverters/UtcDatePatternConverter.cs
@@ -58,7 +58,7 @@ namespace log4net.Util.PatternStringConverters
/// </para>
/// </remarks>
/// <seealso cref="DatePatternConverter"/>
- override protected void Convert(TextWriter writer, object state)
+ protected override void Convert(TextWriter writer, object state)
{
try
{
@@ -79,7 +79,7 @@ namespace log4net.Util.PatternStringConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(UtcDatePatternConverter);
+ private static readonly Type declaringType = typeof(UtcDatePatternConverter);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/PropertiesDictionary.cs b/src/log4net/Util/PropertiesDictionary.cs
index a4dc6c4..e70fb20 100644
--- a/src/log4net/Util/PropertiesDictionary.cs
+++ b/src/log4net/Util/PropertiesDictionary.cs
@@ -108,7 +108,7 @@ namespace log4net.Util
/// a serialization operation is performed.
/// </para>
/// </remarks>
- override public object this[string key]
+ public override object this[string key]
{
get { return InnerHashtable[key]; }
set { InnerHashtable[key] = value; }
diff --git a/src/log4net/Util/ProtectCloseTextWriter.cs b/src/log4net/Util/ProtectCloseTextWriter.cs
index cd610e2..a90f283 100644
--- a/src/log4net/Util/ProtectCloseTextWriter.cs
+++ b/src/log4net/Util/ProtectCloseTextWriter.cs
@@ -83,7 +83,7 @@ namespace log4net.Util
/// This method does nothing.
/// </para>
/// </remarks>
- override public void Close()
+ public override void Close()
{
// do nothing
}
diff --git a/src/log4net/Util/QuietTextWriter.cs b/src/log4net/Util/QuietTextWriter.cs
index 81629b7..6f3c757 100644
--- a/src/log4net/Util/QuietTextWriter.cs
+++ b/src/log4net/Util/QuietTextWriter.cs
@@ -160,7 +160,7 @@ namespace log4net.Util
/// Writes a string to the output.
/// </para>
/// </remarks>
- override public void Write(string value)
+ public override void Write(string value)
{
try
{
@@ -180,7 +180,7 @@ namespace log4net.Util
/// Closes the underlying output writer.
/// </para>
/// </remarks>
- override public void Close()
+ public override void Close()
{
m_closed = true;
base.Close();
diff --git a/src/log4net/Util/SystemInfo.cs b/src/log4net/Util/SystemInfo.cs
index 051c1b2..92e2c60 100644
--- a/src/log4net/Util/SystemInfo.cs
+++ b/src/log4net/Util/SystemInfo.cs
@@ -1176,7 +1176,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(SystemInfo);
+ private static readonly Type declaringType = typeof(SystemInfo);
/// <summary>
/// Cache the host name for the current machine
diff --git a/src/log4net/Util/SystemStringFormat.cs b/src/log4net/Util/SystemStringFormat.cs
index 21860bd..cd71c03 100644
--- a/src/log4net/Util/SystemStringFormat.cs
+++ b/src/log4net/Util/SystemStringFormat.cs
@@ -230,7 +230,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(SystemStringFormat);
+ private static readonly Type declaringType = typeof(SystemStringFormat);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/TextWriterAdapter.cs b/src/log4net/Util/TextWriterAdapter.cs
index e098dad..851eac4 100644
--- a/src/log4net/Util/TextWriterAdapter.cs
+++ b/src/log4net/Util/TextWriterAdapter.cs
@@ -100,7 +100,7 @@ namespace log4net.Util
/// The Encoding in which the output is written
/// </para>
/// </remarks>
- override public Encoding Encoding
+ public override Encoding Encoding
{
get { return m_writer.Encoding; }
}
@@ -116,7 +116,7 @@ namespace log4net.Util
/// Gets an object that controls formatting
/// </para>
/// </remarks>
- override public IFormatProvider FormatProvider
+ public override IFormatProvider FormatProvider
{
get { return m_writer.FormatProvider; }
}
@@ -132,7 +132,7 @@ namespace log4net.Util
/// Gets or sets the line terminator string used by the TextWriter
/// </para>
/// </remarks>
- override public String NewLine
+ public override String NewLine
{
get { return m_writer.NewLine; }
set { m_writer.NewLine = value; }
@@ -168,7 +168,7 @@ namespace log4net.Util
/// Dispose this writer
/// </para>
/// </remarks>
- override protected void Dispose(bool disposing)
+ protected override void Dispose(bool disposing)
{
if (disposing)
{
@@ -185,7 +185,7 @@ namespace log4net.Util
/// to the underlying device
/// </para>
/// </remarks>
- override public void Flush()
+ public override void Flush()
{
m_writer.Flush();
}
@@ -199,7 +199,7 @@ namespace log4net.Util
/// Writes a character to the wrapped TextWriter
/// </para>
/// </remarks>
- override public void Write(char value)
+ public override void Write(char value)
{
m_writer.Write(value);
}
@@ -215,7 +215,7 @@ namespace log4net.Util
/// Writes a character buffer to the wrapped TextWriter
/// </para>
/// </remarks>
- override public void Write(char[] buffer, int index, int count)
+ public override void Write(char[] buffer, int index, int count)
{
m_writer.Write(buffer, index, count);
}
@@ -229,7 +229,7 @@ namespace log4net.Util
/// Writes a string to the wrapped TextWriter
/// </para>
/// </remarks>
- override public void Write(String value)
+ public override void Write(String value)
{
m_writer.Write(value);
}
diff --git a/src/log4net/Util/ThreadContextProperties.cs b/src/log4net/Util/ThreadContextProperties.cs
index 1706085..e002c1b 100644
--- a/src/log4net/Util/ThreadContextProperties.cs
+++ b/src/log4net/Util/ThreadContextProperties.cs
@@ -82,7 +82,7 @@ namespace log4net.Util
/// Gets or sets the value of a property
/// </para>
/// </remarks>
- override public object this[string key]
+ public override object this[string key]
{
get
{
diff --git a/src/log4net/Util/ThreadContextStacks.cs b/src/log4net/Util/ThreadContextStacks.cs
index 3fffb05..0e9c198 100644
--- a/src/log4net/Util/ThreadContextStacks.cs
+++ b/src/log4net/Util/ThreadContextStacks.cs
@@ -116,7 +116,7 @@ namespace log4net.Util
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(ThreadContextStacks);
+ private static readonly Type declaringType = typeof(ThreadContextStacks);
#endregion Private Static Fields
}
diff --git a/src/log4net/Util/TypeConverters/ConverterRegistry.cs b/src/log4net/Util/TypeConverters/ConverterRegistry.cs
index 597ae9f..e20bbd5 100644
--- a/src/log4net/Util/TypeConverters/ConverterRegistry.cs
+++ b/src/log4net/Util/TypeConverters/ConverterRegistry.cs
@@ -292,7 +292,7 @@ namespace log4net.Util.TypeConverters
/// Used by the internal logger to record the Type of the
/// log message.
/// </remarks>
- private readonly static Type declaringType = typeof(ConverterRegistry);
+ private static readonly Type declaringType = typeof(ConverterRegistry);
/// <summary>
/// Mapping from <see cref="Type" /> to type converter.
diff --git a/src/log4net/Util/WindowsSecurityContext.cs b/src/log4net/Util/WindowsSecurityContext.cs
index de98511..6fac8cc 100644
--- a/src/log4net/Util/WindowsSecurityContext.cs
+++ b/src/log4net/Util/WindowsSecurityContext.cs
@@ -327,10 +327,10 @@ namespace log4net.Util
private static extern bool LogonUser(String lpszUsername, String lpszDomain, String lpszPassword, int dwLogonType, int dwLogonProvider, ref IntPtr phToken);
[DllImport("kernel32.dll", CharSet=CharSet.Auto)]
- private extern static bool CloseHandle(IntPtr handle);
+ private static extern bool CloseHandle(IntPtr handle);
[DllImport("advapi32.dll", CharSet=CharSet.Auto, SetLastError=true)]
- private extern static bool DuplicateToken(IntPtr ExistingTokenHandle, int SECURITY_IMPERSONATION_LEVEL, ref IntPtr DuplicateTokenHandle);
+ private static extern bool DuplicateToken(IntPtr ExistingTokenHandle, int SECURITY_IMPERSONATION_LEVEL, ref IntPtr DuplicateTokenHandle);
#endregion