nicko 2004/06/09 01:03:42
Modified: src/Core CompactRepositorySelector.cs
DefaultRepositorySelector.cs
src/Repository LoggerRepositorySkeleton.cs
src/Repository/Hierarchy Hierarchy.cs
Log:
Changed event delivery method names from FireXXX to OnXXX as per .net
guidelines
Revision Changes Path
1.5 +5 -4 logging-log4net/src/Core/CompactRepositorySelector.cs
Index: CompactRepositorySelector.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Core/CompactRepositorySelector.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CompactRepositorySelector.cs 7 Jun 2004 01:07:29 -0000 1.4
+++ CompactRepositorySelector.cs 9 Jun 2004 08:03:41 -0000 1.5
@@ -204,7 +204,7 @@
m_name2repositoryMap[repository] = rep;
// Notify listeners that the repository
has been created
- FireLoggerRepositoryCreatedEvent(rep);
+ OnLoggerRepositoryCreatedEvent(rep);
}
return rep;
@@ -244,11 +244,12 @@
/// Notify the registered listeners that the repository has
been created
/// </summary>
/// <param name="repository">The repository that has been
created</param>
- protected void
FireLoggerRepositoryCreatedEvent(ILoggerRepository repository)
+ protected virtual void
OnLoggerRepositoryCreatedEvent(ILoggerRepository repository)
{
- if (m_loggerRepositoryCreatedEvent != null)
+ LoggerRepositoryCreationEventHandler handler =
m_loggerRepositoryCreatedEvent;
+ if (handler != null)
{
- m_loggerRepositoryCreatedEvent(this, new
LoggerRepositoryCreationEventArgs(repository));
+ handler(this, new
LoggerRepositoryCreationEventArgs(repository));
}
}
}
1.7 +5 -4 logging-log4net/src/Core/DefaultRepositorySelector.cs
Index: DefaultRepositorySelector.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Core/DefaultRepositorySelector.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultRepositorySelector.cs 7 Jun 2004 01:07:29 -0000 1.6
+++ DefaultRepositorySelector.cs 9 Jun 2004 08:03:41 -0000 1.7
@@ -374,7 +374,7 @@
m_name2repositoryMap[repository] = rep;
// Notify listeners that the
repository has been created
-
FireLoggerRepositoryCreatedEvent(rep);
+
OnLoggerRepositoryCreatedEvent(rep);
}
}
@@ -470,11 +470,12 @@
/// Notifies the registered listeners that the repository has
been created.
/// </summary>
/// <param name="repository">The repository that has been
created.</param>
- protected void
FireLoggerRepositoryCreatedEvent(ILoggerRepository repository)
+ protected virtual void
OnLoggerRepositoryCreatedEvent(ILoggerRepository repository)
{
- if (m_loggerRepositoryCreatedEvent != null)
+ LoggerRepositoryCreationEventHandler handler =
m_loggerRepositoryCreatedEvent;
+ if (handler != null)
{
- m_loggerRepositoryCreatedEvent(this, new
LoggerRepositoryCreationEventArgs(repository));
+ handler(this, new
LoggerRepositoryCreationEventArgs(repository));
}
}
1.6 +10 -9
logging-log4net/src/Repository/LoggerRepositorySkeleton.cs
Index: LoggerRepositorySkeleton.cs
===================================================================
RCS file:
/home/cvs/logging-log4net/src/Repository/LoggerRepositorySkeleton.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LoggerRepositorySkeleton.cs 2 Jun 2004 16:18:18 -0000 1.5
+++ LoggerRepositorySkeleton.cs 9 Jun 2004 08:03:41 -0000 1.6
@@ -215,7 +215,7 @@
}
// Notify listeners
- FireShutdownEvent();
+ OnShutdownEvent();
}
/// <summary>
@@ -242,7 +242,7 @@
Configured = false;
// Notify listeners
- FireConfigurationResetEvent();
+ OnConfigurationResetEvent();
}
/// <summary>
@@ -365,23 +365,24 @@
/// <summary>
/// Notify the registered listeners that the repository is
shutting down
/// </summary>
- protected void FireShutdownEvent()
+ protected virtual void OnShutdownEvent()
{
- LoggerRepositoryShutdownEventHandler tmp =
m_shutdownEvent;
- if (tmp != null)
+ LoggerRepositoryShutdownEventHandler handler =
m_shutdownEvent;
+ if (handler != null)
{
- tmp(this, EventArgs.Empty);
+ handler(this, EventArgs.Empty);
}
}
/// <summary>
/// Notify the registered listeners that the repository has had
its configuration reset
/// </summary>
- protected void FireConfigurationResetEvent()
+ protected virtual void OnConfigurationResetEvent()
{
- if (m_configurationResetEvent != null)
+ LoggerRepositoryConfigurationResetEventHandler handler
= m_configurationResetEvent;
+ if (handler != null)
{
- m_configurationResetEvent(this,
EventArgs.Empty);
+ handler(this, EventArgs.Empty);
}
}
}
1.5 +16 -14 logging-log4net/src/Repository/Hierarchy/Hierarchy.cs
Index: Hierarchy.cs
===================================================================
RCS file: /home/cvs/logging-log4net/src/Repository/Hierarchy/Hierarchy.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Hierarchy.cs 7 Jun 2004 01:00:46 -0000 1.4
+++ Hierarchy.cs 9 Jun 2004 08:03:42 -0000 1.5
@@ -422,7 +422,7 @@
Configured = true;
// Notify listeners
- FireConfigurationChangedEvent();
+ OnConfigurationChangedEvent();
}
#endregion Implementation of IBasicRepositoryConfigurator
@@ -457,7 +457,7 @@
Configured = true;
// Notify listeners
- FireConfigurationChangedEvent();
+ OnConfigurationChangedEvent();
}
#endregion Implementation of IXmlRepositoryConfigurator
@@ -559,7 +559,7 @@
logger.Hierarchy = this;
m_ht[key] = logger;
UpdateParents(logger);
- FireLoggerCreationEvent(logger);
+ OnLoggerCreationEvent(logger);
return logger;
}
else if (node is Logger)
@@ -573,7 +573,7 @@
m_ht[key] = logger;
UpdateChildren((ProvisionNode)node,
logger);
UpdateParents(logger);
- FireLoggerCreationEvent(logger);
+ OnLoggerCreationEvent(logger);
return logger;
}
else
@@ -591,29 +591,31 @@
/// <summary>
/// Notify the registered listeners that the hierarchy has had
its configuration changed
/// </summary>
- protected void FireConfigurationChangedEvent()
+ protected virtual void OnConfigurationChangedEvent()
{
- if (m_configurationChangedEvent != null)
+ HierarchyConfigurationChangedEventHandler handler =
m_configurationChangedEvent;
+ if (handler != null)
{
- m_configurationChangedEvent(this,
EventArgs.Empty);
+ handler(this, EventArgs.Empty);
}
}
- #endregion Protected Instance Methods
-
- #region Private Instance Methods
-
/// <summary>
/// Sends a logger creation event to all registered listeners
/// </summary>
/// <param name="logger">The newly created logger</param>
- private void FireLoggerCreationEvent(Logger logger)
+ protected virtual void OnLoggerCreationEvent(Logger logger)
{
- if (m_loggerCreatedEvent != null)
+ LoggerCreationEventHandler handler =
m_loggerCreatedEvent;
+ if (handler != null)
{
- m_loggerCreatedEvent(this, new
LoggerCreationEventArgs(logger));
+ handler(this, new
LoggerCreationEventArgs(logger));
}
}
+
+ #endregion Protected Instance Methods
+
+ #region Private Instance Methods
/// <summary>
/// Updates all the parents of the specified logger
