From a7ab2ab3fe147699c457f7fc46bfded184d313a3 Mon Sep 17 00:00:00 2001
From: Chris Cameron <chris.cameron@wedoresi.com>
Date: Mon, 29 Mar 2021 16:23:29 -0400
Subject: [PATCH] refactor: Renaming OrderedDictionary to SortedDictionary for
 consistency with .Net

---
 ...dDictionaryTest.cs => IcdSortedDictionaryTest.cs} | 12 ++++++------
 ...cdOrderedDictionary.cs => IcdSortedDictionary.cs} | 10 +++++-----
 ICD.Common.Utils/Collections/PriorityQueue.cs        |  4 ++--
 ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename ICD.Common.Utils.Tests/Collections/{IcdOrderedDictionaryTest.cs => IcdSortedDictionaryTest.cs} (82%)
 rename ICD.Common.Utils/Collections/{IcdOrderedDictionary.cs => IcdSortedDictionary.cs} (92%)

diff --git a/ICD.Common.Utils.Tests/Collections/IcdOrderedDictionaryTest.cs b/ICD.Common.Utils.Tests/Collections/IcdSortedDictionaryTest.cs
similarity index 82%
rename from ICD.Common.Utils.Tests/Collections/IcdOrderedDictionaryTest.cs
rename to ICD.Common.Utils.Tests/Collections/IcdSortedDictionaryTest.cs
index 65b6931..eefe84f 100644
--- a/ICD.Common.Utils.Tests/Collections/IcdOrderedDictionaryTest.cs
+++ b/ICD.Common.Utils.Tests/Collections/IcdSortedDictionaryTest.cs
@@ -5,14 +5,14 @@ using NUnit.Framework;
 namespace ICD.Common.Utils.Tests.Collections
 {
 	[TestFixture]
-	public sealed class IcdOrderedDictionaryTest
+	public sealed class IcdSortedDictionaryTest
 	{
 		#region Properties
 
 		[Test]
 		public void CountTest()
 		{
-			IcdOrderedDictionary<int, int> dict = new IcdOrderedDictionary<int, int>
+			IcdSortedDictionary<int, int> dict = new IcdSortedDictionary<int, int>
 			{
 				{0, 0},
 				{1, 10},
@@ -25,7 +25,7 @@ namespace ICD.Common.Utils.Tests.Collections
 		[Test]
 		public void IsReadOnlyTest()
 		{
-			IcdOrderedDictionary<int, int> dict = new IcdOrderedDictionary<int, int>();
+			IcdSortedDictionary<int, int> dict = new IcdSortedDictionary<int, int>();
 
 			Assert.IsFalse(dict.IsReadOnly);
 		}
@@ -33,7 +33,7 @@ namespace ICD.Common.Utils.Tests.Collections
 		[Test]
 		public void KeysTest()
 		{
-			IcdOrderedDictionary<int, int> dict = new IcdOrderedDictionary<int, int>
+			IcdSortedDictionary<int, int> dict = new IcdSortedDictionary<int, int>
 			{
 				{0, 0},
 				{1, 10},
@@ -51,7 +51,7 @@ namespace ICD.Common.Utils.Tests.Collections
 		[Test]
 		public void ValuesTest()
 		{
-			IcdOrderedDictionary<int, int> dict = new IcdOrderedDictionary<int, int>
+			IcdSortedDictionary<int, int> dict = new IcdSortedDictionary<int, int>
 			{
 				{0, 0},
 				{1, 10},
@@ -70,7 +70,7 @@ namespace ICD.Common.Utils.Tests.Collections
 		public void IndexerTest()
 		{
 			// ReSharper disable UseObjectOrCollectionInitializer
-			IcdOrderedDictionary<int, int> dict = new IcdOrderedDictionary<int, int>();
+			IcdSortedDictionary<int, int> dict = new IcdSortedDictionary<int, int>();
 			// ReSharper restore UseObjectOrCollectionInitializer
 
 			dict[0] = 0;
diff --git a/ICD.Common.Utils/Collections/IcdOrderedDictionary.cs b/ICD.Common.Utils/Collections/IcdSortedDictionary.cs
similarity index 92%
rename from ICD.Common.Utils/Collections/IcdOrderedDictionary.cs
rename to ICD.Common.Utils/Collections/IcdSortedDictionary.cs
index edaa41c..94da8df 100644
--- a/ICD.Common.Utils/Collections/IcdOrderedDictionary.cs
+++ b/ICD.Common.Utils/Collections/IcdSortedDictionary.cs
@@ -13,7 +13,7 @@ namespace ICD.Common.Utils.Collections
 #if !SIMPLSHARP
 	[DebuggerDisplay("Count = {Count}")]
 #endif
-	public sealed class IcdOrderedDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+	public sealed class IcdSortedDictionary<TKey, TValue> : IDictionary<TKey, TValue>
 	{
 		private readonly List<TKey> m_OrderedKeys;
 		private readonly List<TValue> m_ValuesOrderedByKey; 
@@ -52,7 +52,7 @@ namespace ICD.Common.Utils.Collections
 		/// <summary>
 		/// Constructor.
 		/// </summary>
-		public IcdOrderedDictionary()
+		public IcdSortedDictionary()
 			: this(Comparer<TKey>.Default)
 		{
 		}
@@ -61,7 +61,7 @@ namespace ICD.Common.Utils.Collections
 		/// Constructor.
 		/// </summary>
 		/// <param name="comparer"></param>
-		public IcdOrderedDictionary([NotNull] IComparer<TKey> comparer)
+		public IcdSortedDictionary([NotNull] IComparer<TKey> comparer)
 			: this(comparer, EqualityComparer<TKey>.Default)
 		{
 		}
@@ -71,7 +71,7 @@ namespace ICD.Common.Utils.Collections
 		/// </summary>
 		/// <param name="comparer"></param>
 		/// <param name="equalityComparer"></param>
-		public IcdOrderedDictionary([NotNull] IComparer<TKey> comparer, [NotNull] IEqualityComparer<TKey> equalityComparer)
+		public IcdSortedDictionary([NotNull] IComparer<TKey> comparer, [NotNull] IEqualityComparer<TKey> equalityComparer)
 		{
 			if (comparer == null)
 				throw new ArgumentNullException("comparer");
@@ -89,7 +89,7 @@ namespace ICD.Common.Utils.Collections
 		/// Constructor.
 		/// </summary>
 		/// <param name="dictionary"></param>
-		public IcdOrderedDictionary([NotNull] IEnumerable<KeyValuePair<TKey, TValue>> dictionary)
+		public IcdSortedDictionary([NotNull] IEnumerable<KeyValuePair<TKey, TValue>> dictionary)
 			: this()
 		{
 			if (dictionary == null)
diff --git a/ICD.Common.Utils/Collections/PriorityQueue.cs b/ICD.Common.Utils/Collections/PriorityQueue.cs
index d7f9635..5dea416 100644
--- a/ICD.Common.Utils/Collections/PriorityQueue.cs
+++ b/ICD.Common.Utils/Collections/PriorityQueue.cs
@@ -18,7 +18,7 @@ namespace ICD.Common.Utils.Collections
 #endif
 	public sealed class PriorityQueue<T> : IEnumerable<T>, ICollection
 	{
-		private readonly IcdOrderedDictionary<int, List<T>> m_PriorityToQueue;
+		private readonly IcdSortedDictionary<int, List<T>> m_PriorityToQueue;
 		private int m_Count;
 
 		#region Properties
@@ -46,7 +46,7 @@ namespace ICD.Common.Utils.Collections
 		/// </summary>
 		public PriorityQueue()
 		{
-			m_PriorityToQueue = new IcdOrderedDictionary<int, List<T>>();
+			m_PriorityToQueue = new IcdSortedDictionary<int, List<T>>();
 		}
 
 		#region Methods
diff --git a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
index 6f1653f..0dae781 100644
--- a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
+++ b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj
@@ -80,7 +80,7 @@
     <Compile Include="Attributes\IIcdAttribute.cs" />
     <Compile Include="Attributes\RangeAttribute.cs" />
     <Compile Include="Collections\BiDictionary.cs" />
-    <Compile Include="Collections\IcdOrderedDictionary.cs" />
+    <Compile Include="Collections\IcdSortedDictionary.cs" />
     <Compile Include="Collections\INotifyCollectionChanged.cs" />
     <Compile Include="Collections\PriorityQueue.cs" />
     <Compile Include="Collections\RateLimitedEventQueue.cs" />