Merge remote-tracking branch 'origin/ConnectPro_v1.6' into ConnectPro_v1.7

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Chris Cameron
2020-05-19 10:50:55 -04:00
6 changed files with 72 additions and 1 deletions

View File

@@ -2,6 +2,8 @@
using System.Collections;
using System.Collections.Generic;
using ICD.Common.Properties;
using ICD.Common.Utils.EventArguments;
using ICD.Common.Utils.Extensions;
namespace ICD.Common.Utils.Collections
{
@@ -15,6 +17,11 @@ namespace ICD.Common.Utils.Collections
private readonly LinkedList<TContents> m_Collection;
private int m_MaxSize;
/// <summary>
/// Raised when an item is trimmed from the end of the queue.
/// </summary>
public event EventHandler<GenericEventArgs<TContents>> OnItemTrimmed;
#region Properties
/// <summary>
@@ -141,7 +148,11 @@ namespace ICD.Common.Utils.Collections
private void Trim()
{
while (Count > MaxSize)
{
TContents removed = m_Collection.First.Value;
m_Collection.RemoveFirst();
OnItemTrimmed.Raise(this, new GenericEventArgs<TContents>(removed));
}
}
#endregion

View File

@@ -0,0 +1,15 @@
using System;
namespace ICD.Common.Utils.EventArguments
{
public sealed class DateTimeNullableEventArgs : GenericEventArgs<DateTime?>
{
/// <summary>
/// Constructor.
/// </summary>
/// <param name="data"></param>
public DateTimeNullableEventArgs(DateTime? data) : base(data)
{
}
}
}

View File

@@ -98,6 +98,7 @@
<Compile Include="EventArguments\BoolEventArgs.cs" />
<Compile Include="EventArguments\CharEventArgs.cs" />
<Compile Include="EventArguments\DateTimeEventArgs.cs" />
<Compile Include="EventArguments\DateTimeNullableEventArgs.cs" />
<Compile Include="EventArguments\FloatEventArgs.cs" />
<Compile Include="EventArguments\GenericEventArgs.cs" />
<Compile Include="EventArguments\IGenericEventArgs.cs" />

View File

@@ -4,4 +4,4 @@ using System.Reflection;
[assembly: AssemblyCompany("ICD Systems")]
[assembly: AssemblyProduct("ICD.Common.Utils")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2020")]
[assembly: AssemblyVersion("11.0.0.0")]
[assembly: AssemblyVersion("11.1.0.0")]