Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Spring/Spring.Core/Context/ApplicationEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public ApplicationEventArgs()
}

/// <summary>
/// The date and time when the event occured.
/// The date and time when the event occurred.
/// </summary>
/// <value>
/// The date and time when the event occured.
/// The date and time when the event occurred.
/// </value>
public DateTime TimeStamp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ protected virtual void OnContextEvent(object source, ApplicationEventArgs e)
{
Delegate target = ContextEvent.GetInvocationList()[0];
Exception exception = exceptions[target];
throw new ApplicationContextException(string.Format("An unhandled exception occured during processing application event {0} in handler {1}", e.GetType(), target.Method), exception);
throw new ApplicationContextException(string.Format("An unhandled exception occurred during processing application event {0} in handler {1}", e.GetType(), target.Method), exception);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public override void AfterPropertiesSet()
/// Creates the delegate.
/// </summary>
/// <exception cref="System.Exception">
/// If an exception occured during object creation.
/// If an exception occurred during object creation.
/// </exception>
/// <returns>The object returned by this factory.</returns>
/// <seealso cref="Spring.Objects.Factory.Config.AbstractFactoryObject.CreateInstance()"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public class PropertyOverrideConfigurer : PropertyResourceConfigurer
/// </param>
/// <param name="props">The properties to apply.</param>
/// <exception cref="Spring.Objects.ObjectsException">
/// If an error occured.
/// If an error occurred.
/// </exception>
protected override void ProcessProperties(
IConfigurableListableObjectFactory factory, NameValueCollection props)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public bool IncludeAncestors
/// </param>
/// <param name="props">The properties to apply.</param>
/// <exception cref="Spring.Objects.ObjectsException">
/// If an error occured.
/// If an error occurred.
/// </exception>
protected override void ProcessProperties(IConfigurableListableObjectFactory factory, NameValueCollection props)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public override void AfterPropertiesSet()
/// returned by this factory.
/// </summary>
/// <exception cref="System.Exception">
/// If an exception occured during object creation.
/// If an exception occurred during object creation.
/// </exception>
/// <returns>The object returned by this factory.</returns>
protected override object CreateInstance()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public int Order
/// used by the application context.
/// </param>
/// <exception cref="Spring.Objects.ObjectsException">
/// If an error occured.
/// If an error occurred.
/// </exception>
protected virtual void ProcessProperties(IConfigurableListableObjectFactory factory)
{
Expand Down
8 changes: 4 additions & 4 deletions src/Spring/Spring.Core/Util/ConfigurationUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static void RefreshSection(string sectionName)
/// <param name="message">The message to display to the client when the exception is thrown.</param>
/// <param name="inner">The inner exception.</param>
/// <param name="fileName">Name of the configuration file.</param>
/// <param name="line">The line where exception occured.</param>
/// <param name="line">The line where exception occurred.</param>
/// <returns>Configuration exception.</returns>
public static Exception CreateConfigurationException(string message, Exception inner, string fileName, int line)
{
Expand All @@ -113,7 +113,7 @@ public static Exception CreateConfigurationException(string message, Exception i
/// </summary>
/// <param name="message">The message to display to the client when the exception is thrown.</param>
/// <param name="fileName">Name of the configuration file.</param>
/// <param name="line">The line where exception occured.</param>
/// <param name="line">The line where exception occurred.</param>
/// <returns>Configuration exception.</returns>
public static Exception CreateConfigurationException(string message, string fileName, int line)
{
Expand All @@ -125,7 +125,7 @@ public static Exception CreateConfigurationException(string message, string file
/// </summary>
/// <param name="message">The message to display to the client when the exception is thrown.</param>
/// <param name="inner">The inner exception.</param>
/// <param name="node">XML node where exception occured.</param>
/// <param name="node">XML node where exception occurred.</param>
/// <returns>Configuration exception.</returns>
public static Exception CreateConfigurationException(string message, Exception inner, XmlNode node)
{
Expand All @@ -136,7 +136,7 @@ public static Exception CreateConfigurationException(string message, Exception i
/// Creates the configuration exception.
/// </summary>
/// <param name="message">The message to display to the client when the exception is thrown.</param>
/// <param name="node">XML node where exception occured.</param>
/// <param name="node">XML node where exception occurred.</param>
/// <returns>Configuration exception.</returns>
public static Exception CreateConfigurationException(string message, XmlNode node)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected ISession DoGetSession(bool allowCreate)
/// <code>org.springframework.dao</code> hierarchy. Will automatically detect
/// wrapped ADO.NET Exceptions and convert them accordingly.
/// </summary>
/// <param name="ex">HibernateException that occured.</param>
/// <param name="ex">HibernateException that occurred.</param>
/// <returns>
/// The corresponding DataAccessException instance
/// </returns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ protected void FlushIfNecessary(ISession session, bool existingTransaction)
/// <code>org.springframework.dao</code> hierarchy. Will automatically detect
/// wrapped ADO.NET Exceptions and convert them accordingly.
/// </summary>
/// <param name="ex">HibernateException that occured.</param>
/// <param name="ex">HibernateException that occurred.</param>
/// <returns>
/// The corresponding DataAccessException instance
/// </returns>
Expand All @@ -413,7 +413,7 @@ public virtual DataAccessException ConvertHibernateAccessException(HibernateExce
/// Converts the ADO.NET access exception to an appropriate exception from the
/// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
/// <param name="ex">ADOException that occurred, wrapping underlying ADO.NET exception.</param>
/// <returns>
/// the corresponding DataAccessException instance
/// </returns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ protected virtual IDbTransaction GetIDbTransaction(ITransaction hibernateTx)
/// Convert the given HibernateException to an appropriate exception from
/// the Spring.Dao hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">The HibernateException that occured.</param>
/// <param name="ex">The HibernateException that occurred.</param>
/// <returns>The corresponding DataAccessException instance</returns>
protected virtual DataAccessException ConvertHibernateAccessException(HibernateException ex)
{
Expand All @@ -678,7 +678,7 @@ protected virtual DataAccessException ConvertHibernateAccessException(HibernateE
/// Convert the given ADOException to an appropriate exception from the
/// the Spring.Dao hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">The ADOException that occured, wrapping the underlying
/// <param name="ex">The ADOException that occurred, wrapping the underlying
/// ADO.NET thrown exception.</param>
/// <param name="translator">The translator to convert hibernate ADOExceptions.</param>
/// <returns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ protected IDbTransaction GetIDbTransaction(ITransaction hibernateTx)
/// Convert the given HibernateException to an appropriate exception from
/// the Spring.Dao hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">The HibernateException that occured.</param>
/// <param name="ex">The HibernateException that occurred.</param>
/// <returns>The corresponding DataAccessException instance</returns>
protected virtual DataAccessException ConvertHibernateAccessException(HibernateException ex)
{
Expand All @@ -866,7 +866,7 @@ protected virtual DataAccessException ConvertHibernateAccessException(HibernateE
/// Convert the given ADOException to an appropriate exception from the
/// the Spring.Dao hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">The ADOException that occured, wrapping the underlying
/// <param name="ex">The ADOException that occurred, wrapping the underlying
/// ADO.NET thrown exception.</param>
/// <param name="translator">The translator to convert hibernate ADOExceptions.</param>
/// <returns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ public DataAccessException TranslateExceptionIfPossible(Exception ex)
/// Will automatically apply a specified IAdoExceptionTranslator to a
/// Hibernate ADOException, else rely on Hibernate's default translation.
/// </summary>
/// <param name="ex">The Hibernate exception that occured.</param>
/// <param name="ex">The Hibernate exception that occurred.</param>
/// <returns>A corresponding DataAccessException</returns>
protected virtual DataAccessException ConvertHibernateException(HibernateException ex)
{
Expand All @@ -981,7 +981,7 @@ protected virtual DataAccessException ConvertHibernateException(HibernateExcepti
/// Converts the ADO.NET access exception to an appropriate exception from the
/// <code>org.springframework.dao</code> hierarchy. Can be overridden in subclasses.
/// </summary>
/// <param name="ex">ADOException that occured, wrapping underlying ADO.NET exception.</param>
/// <param name="ex">ADOException that occurred, wrapping underlying ADO.NET exception.</param>
/// <returns>
/// the corresponding DataAccessException instance
/// </returns>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public static DataAccessException ConvertAdoAccessException(IAdoExceptionTransla
/// handle AdoException specifically by using a AdoExceptionTranslator for the
/// underlying ADO.NET exception.
/// </summary>
/// <param name="ex">The Hibernate exception that occured.</param>
/// <param name="ex">The Hibernate exception that occurred.</param>
/// <returns>DataAccessException instance</returns>
public static DataAccessException ConvertHibernateAccessException(HibernateException ex)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public CaoFactoryObject()
/// <summary>
/// Callback method called once all factory properties have been set.
/// </summary>
/// <exception cref="System.Exception">if an error occured</exception>
/// <exception cref="System.Exception">if an error occurred</exception>
public void AfterPropertiesSet()
{
if (RemoteTargetName == null)
Expand Down
2 changes: 1 addition & 1 deletion src/Spring/Spring.Services/Remoting/SaoFactoryObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public SaoFactoryObject()
/// <summary>
/// Callback method called once all factory properties have been set.
/// </summary>
/// <exception cref="System.Exception">if an error occured</exception>
/// <exception cref="System.Exception">if an error occurred</exception>
public void AfterPropertiesSet()
{
if (ServiceUrl == null)
Expand Down
2 changes: 1 addition & 1 deletion src/Spring/Spring.Web/Web/Support/Result.cs
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ protected virtual StringBuilder BuildUrlParameter(StringBuilder url, string key,
/// </summary>
/// <param name="context">the context to be used for evaluation.</param>
/// <param name="value">the string that might need evaluation</param>
/// <returns>the evaluation result. Unodified <paramref name="value"/> if no evalution occured.</returns>
/// <returns>the evaluation result. Unodified <paramref name="value"/> if no evalution occurred.</returns>
protected virtual object ResolveValueIfNecessary(object context, string value)
{
return ResolveSpELRuntimeExpressionIfNecessary(context, value);
Expand Down