Make a NamedDictionary object in BizHawk.Common, and move some collection objects to their own file. new Mnemonic system - use NamedDictionary

BizHawk.Client.Common/movie/MnemonicsLookupTable.cs

@@ -3,18 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+using BizHawk.Common;
+
 namespace BizHawk.Client.Common
 {
-	public class MnemonicCollection : Dictionary<string, char>
+	public class MnemonicCollection : NamedDictionary<string, char>
 	{
-		private readonly string _name = String.Empty;
-
 		public MnemonicCollection(string name)
+			: base(name)
 		{
-			_name = name;
+			
 		}
-
-		public string Name { get { return _name; } }
 	}
 
 	public class CoreMnemonicCollection : List<MnemonicCollection>

BizHawk.Common/BizHawk.Common.csproj

@@ -50,6 +50,7 @@
     <Compile Include="BitReverse.cs" />
     <Compile Include="Buffer.cs" />
     <Compile Include="Colors.cs" />
+    <Compile Include="CustomCollections.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="HawkFile.cs" />
     <Compile Include="IPC\IPCRingBuffer.cs" />

BizHawk.Common/CustomCollections.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+
+namespace BizHawk.Common
+{
+	/// <summary>
+	/// A dictionary that creates new values on the fly as necessary so that any key you need will be defined. 
+	/// </summary>
+	/// <typeparam name="K">dictionary keys</typeparam>
+	/// <typeparam name="V">dictionary values</typeparam>
+	[Serializable]
+	public class WorkingDictionary<K, V> : Dictionary<K, V> where V : new()
+	{
+		public new V this[K key]
+		{
+			get
+			{
+				V temp;
+				if (!TryGetValue(key, out temp))
+				{
+					temp = this[key] = new V();
+				}
+
+				return temp;
+			}
+
+			set
+			{
+				base[key] = value;
+			}
+		}
+
+		public WorkingDictionary() { }
+
+		protected WorkingDictionary(SerializationInfo info, StreamingContext context) : base(info, context) { }
+	}
+
+	/// <summary>
+	/// A dictionary that contains a name parameter, which is required
+	/// </summary>
+	public class NamedDictionary<K, V> : Dictionary<K, V>
+	{
+		public NamedDictionary(string name)
+		{
+			Name = name;
+		}
+
+		public string Name { get; private set; }
+	}
+
+	/// <summary>
+	/// a Dictionary-of-lists with key K and values List&lt;V&gt;
+	/// </summary>
+	[Serializable]
+	public class Bag<K, V> : BagBase<K, V, Dictionary<K, List<V>>, List<V>> { }
+
+	/// <summary>
+	/// a Dictionary-of-lists with key K and values List&lt;V&gt;
+	/// </summary>
+	[Serializable]
+	public class SortedBag<K, V> : BagBase<K, V, SortedDictionary<K, List<V>>, List<V>> { }
+
+	/// <summary>
+	/// base class for Bag and SortedBag
+	/// </summary>
+	/// <typeparam name="K">dictionary keys</typeparam>
+	/// <typeparam name="V">list values</typeparam>
+	/// <typeparam name="D">dictionary type</typeparam>
+	/// <typeparam name="L">list type</typeparam>
+	[Serializable]
+	public class BagBase<K, V, D, L> : IEnumerable<V>
+		where D : IDictionary<K, L>, new()
+		where L : IList<V>, IEnumerable<V>, new()
+	{
+		readonly D dictionary = new D();
+		public void Add(K key, V val)
+		{
+			this[key].Add(val);
+		}
+
+		public bool ContainsKey(K key) { return dictionary.ContainsKey(key); }
+
+		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+		public IEnumerator<V> GetEnumerator()
+		{
+			return dictionary.Values.SelectMany(lv => lv).GetEnumerator();
+		}
+
+		public IEnumerable KeyValuePairEnumerator { get { return dictionary; } }
+
+		/// <summary>
+		/// Gets the list of keys contained herein
+		/// </summary>
+		public IList<K> Keys { get { return new List<K>(dictionary.Keys); } }
+
+		public L this[K key]
+		{
+			get
+			{
+				L slot;
+				if (!dictionary.TryGetValue(key, out slot))
+				{
+					dictionary[key] = slot = new L();
+				}
+
+				return slot;
+			}
+
+			set
+			{
+				dictionary[key] = value;
+			}
+		}
+	}
+}

BizHawk.Common/Util.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Runtime.Serialization;
 using System.Text;
 
 namespace BizHawk.Common
@@ -380,103 +376,6 @@ namespace BizHawk.Common
 		}
 	}
 
-	/// <summary>
-	/// a Dictionary-of-lists with key K and values List&lt;V&gt;
-	/// </summary>
-	[Serializable]
-	public class Bag<K, V> : BagBase<K, V, Dictionary<K, List<V>>, List<V>> { }
-
-	/// <summary>
-	/// a Dictionary-of-lists with key K and values List&lt;V&gt;
-	/// </summary>
-	[Serializable]
-	public class SortedBag<K, V> : BagBase<K, V, SortedDictionary<K, List<V>>, List<V>> { }
-
-	/// <summary>
-	/// A dictionary that creates new values on the fly as necessary so that any key you need will be defined. 
-	/// </summary>
-	/// <typeparam name="K">dictionary keys</typeparam>
-	/// <typeparam name="V">dictionary values</typeparam>
-	[Serializable]
-	public class WorkingDictionary<K, V> : Dictionary<K, V> where V : new()
-	{
-		public new V this[K key]
-		{
-			get
-			{
-				V temp;
-				if (!TryGetValue(key, out temp))
-				{
-					temp = this[key] = new V();
-				}
-
-				return temp;
-			}
-
-			set
-			{
-				base[key] = value;
-			}
-		}
-
-		public WorkingDictionary() { }
-
-		protected WorkingDictionary(SerializationInfo info, StreamingContext context) : base(info, context) { }
-	}
-
-	/// <summary>
-	/// base class for Bag and SortedBag
-	/// </summary>
-	/// <typeparam name="K">dictionary keys</typeparam>
-	/// <typeparam name="V">list values</typeparam>
-	/// <typeparam name="D">dictionary type</typeparam>
-	/// <typeparam name="L">list type</typeparam>
-	[Serializable]
-	public class BagBase<K, V, D, L> : IEnumerable<V>
-		where D : IDictionary<K, L>, new()
-		where L : IList<V>, IEnumerable<V>, new()
-	{
-		readonly D dictionary = new D();
-		public void Add(K key, V val)
-		{
-			this[key].Add(val);
-		}
-
-		public bool ContainsKey(K key) { return dictionary.ContainsKey(key); }
-
-		IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
-		public IEnumerator<V> GetEnumerator()
-		{
-			return dictionary.Values.SelectMany(lv => lv).GetEnumerator();
-		}
-
-		public IEnumerable KeyValuePairEnumerator { get { return dictionary; } }
-
-		/// <summary>
-		/// Gets the list of keys contained herein
-		/// </summary>
-		public IList<K> Keys { get { return new List<K>(dictionary.Keys); } }
-
-		public L this[K key]
-		{
-			get
-			{
-				L slot;
-				if (!dictionary.TryGetValue(key, out slot))
-				{
-					dictionary[key] = slot = new L();
-				}
-
-				return slot;
-			}
-
-			set
-			{
-				dictionary[key] = value;
-			}
-		}
-	}
-
 	[Serializable]
 	public class NotTestedException : Exception
 	{