agate-svn-commit Mailing List for AgateLib (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1337
          http://agate.svn.sourceforge.net/agate/?rev=1337&view=rev
Author:   kanato
Date:     2012-03-06 05:28:04 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Added option to encode arrays as comma separated lists in the xml file.
Reorganized XleSerializationInfo file.

Modified Paths:
--------------
    trunk/AgateLib/AgateLib.csproj
    trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs
    trunk/Tools/FontCreator/FontCreator.csproj

Modified: trunk/AgateLib/AgateLib.csproj
===================================================================

--- trunk/AgateLib/AgateLib.csproj	2012-02-27 20:12:52 UTC (rev 1336)
+++ trunk/AgateLib/AgateLib.csproj	2012-03-06 05:28:04 UTC (rev 1337)
@@ -180,6 +180,7 @@
     <Compile Include="PlatformType.cs" />
     <Compile Include="Resources\ImageResource.cs" />
     <Compile Include="Serialization\Xle\CompressionType.cs" />
+    <Compile Include="Serialization\Xle\NumericEncoding.cs" />
     <Compile Include="Settings\SettingsGroup.cs" />
     <Compile Include="Timing.cs">
       <SubType>Code</SubType>

Modified: trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs
===================================================================
--- trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs	2012-02-27 20:12:52 UTC (rev 1336)
+++ trunk/AgateLib/Serialization/Xle/XleSerializationInfo.cs	2012-03-06 05:28:04 UTC (rev 1337)
@@ -36,11 +36,6 @@
 		XmlDocument doc;
 		Stack<XmlElement> nodes = new Stack<XmlElement>();
 
-		/// <summary>
-		/// The ITypeBinder object used.
-		/// </summary>
-		public ITypeBinder Binder { get; internal set; }
-
 		internal XleSerializationInfo()
 		{
 			doc = new XmlDocument();
@@ -93,6 +88,8 @@
 
 		#region --- Writing methods ---
 
+		#region --- Writing single values to the XML ---
+
 		/// <summary>
 		/// Writes a field to the XML data as an element.
 		/// </summary>
@@ -302,29 +299,115 @@
 		}
 
 		/// <summary>
+		/// Writes an object implementing IXleSerializable to the XML data as an element.
+		/// </summary>
+		/// <param name="name">The name of the XML element used.</param>
+		/// <param name="value">The object data to write.</param>
+		public void Write(string name, IXleSerializable value)
+		{
+			XmlElement element = CreateElement(name);
+
+			if (value == null)
+				AddAttribute(element, "type", "null");
+			else
+			{
+				AddAttribute(element, "type", value.GetType().ToString());
+
+				nodes.Push(element);
+
+				Serialize(value);
+
+				nodes.Pop();
+			}
+		}
+		private XmlElement WriteAsElement<T>(string name, T value) where T : IConvertible
+		{
+			XmlElement element = doc.CreateElement(name);
+
+			element.InnerText = value.ToString();
+
+			CurrentNode.AppendChild(element);
+
+			return element;
+		}
+		private void WriteAsAttribute<T>(string name, T value) where T : IConvertible
+		{
+			AddAttribute(CurrentNode, name, Convert.ToString(value));
+		}
+
+		private XmlElement CreateElement(string name)
+		{
+			XmlElement element = doc.CreateElement(name);
+
+			for (int i = 0; i < CurrentNode.ChildNodes.Count; i++)
+			{
+				if (CurrentNode.ChildNodes[i].Name == name)
+					throw new XleSerializationException("The name " + name + " already exists.");
+			}
+
+			CurrentNode.AppendChild(element);
+
+			return element;
+		}
+		#endregion
+		#region --- Writing arrays ---
+
+		/// <summary>
 		/// Writes an int[] array to the XML data as an element.
 		/// </summary>
 		/// <param name="name">The name of the XML element used.</param>
 		/// <param name="value">The array data to write.</param>
 		public void Write(string name, int[] value)
 		{
-			byte[] array = new byte[value.Length * 4];
+			WriteImpl(name, value, NumericEncoding.Base64);
+		}
+		/// <summary>
+		/// Writes an int[] array to the XML data as an element with the specified encoding.
+		/// </summary>
+		/// <param name="name"></param>
+		/// <param name="value"></param>
+		/// <param name="encoding"></param>
+		public void Write(string name, int[] value, NumericEncoding encoding)
+		{
+			WriteImpl(name, value, encoding);
+		}
 
-			if (array.Length > 0)
+		private void WriteImpl(string name, int[] value, NumericEncoding encoding)
+		{
+			switch (encoding)
 			{
-				unsafe
-				{
-					fixed (int* val = value)
+				case NumericEncoding.Base64:
+					byte[] array = new byte[value.Length * 4];
+
+					if (array.Length > 0)
 					{
-						Marshal.Copy((IntPtr)val, array, 0, array.Length);
+						unsafe
+						{
+							fixed (int* val = value)
+							{
+								Marshal.Copy((IntPtr)val, array, 0, array.Length);
+							}
+						}
 					}
-				}
+
+					WriteBase64Encoded(name, array);
+					break;
+
+				case NumericEncoding.Csv:
+					string newValue = string.Join(",", value);
+
+					XmlElement el = WriteAsElement(name, newValue);
+
+					AddAttribute(el, "array", "true");
+					AddAttribute(el, "encoding", "Csv");
+
+					break;
+
+				default:
+					throw new ArgumentException("Value of encoding is not understood.");
 			}
-			Write(name, array);
-
 		}
 
-
 		/// <summary>
 		/// Writes a bool[] array to the XML data as an element.
 		/// </summary>
@@ -336,8 +419,8 @@
 
 			for (int i = 0; i < value.Length; i++)
 				array[i] = (byte)(value[i] ? 1 : 0);
-			
-			Write(name, array);
+
+			WriteBase64Encoded(name, array);
 		}
 
 		/// <summary>
@@ -356,49 +439,10 @@
 					Marshal.Copy((IntPtr)val, array, 0, array.Length);
 				}
 			}
-			Write(name, array);
 
+			WriteBase64Encoded(name, array);
 		}
-		/// <summary>
-		/// Writes a binary stream to the XML data as an element.  
-		/// Compresses the stream using GZip compression.
-		/// </summary>
-		/// <param name="name">The name of the XML element used.</param>
-		/// <param name="value">The stream of data to write.</param>
-		public void Write(string name, Stream value)
-		{
-			Write(name, value, CompressionType.GZip);
-		}
-		/// <summary>
-		/// Writes a binary stream to the XML data as an element.
-		/// </summary>
-		/// <param name="name">The name of the XML element used.</param>
-		/// <param name="value">The stream of data to write.</param>
-		/// <param name="compression">The compression algorithm to use.</param>
-		public void Write(string name, Stream value, CompressionType compression)
-		{
-			WriteImpl(name, value, compression);
-		}
 
-		private void WriteImpl(string name, Stream value, CompressionType compression)
-		{
-			MemoryStream ms = new MemoryStream();
-			Stream compressed = TranslateStream(ms, compression, CompressionMode.Compress);
-
-			byte[] uncompressedData = ReadFromStream(value);
-			compressed.Write(uncompressedData, 0, uncompressedData.Length);
-
-			byte[] buffer = ms.GetBuffer();
-
-			string newValue = Convert.ToBase64String(
-				buffer/*, Base64FormattingOptions.InsertLineBreaks*/);
-
-			XmlElement el = WriteAsElement(name, newValue);
-			AddAttribute(el, "stream", "true");
-			AddAttribute(el, "compression", compression.ToString());
-			AddAttribute(el, "encoding", "Base64");
-		}
-
 		/// <summary>
 		/// Writes a byte[] array to the XML data as an element.
 		/// </summary>
@@ -406,35 +450,20 @@
 		/// <param name="value">The array data to write.</param>
 		public void Write(string name, byte[] value)
 		{
+			WriteBase64Encoded(name, value);
+		}
+
+		private void WriteBase64Encoded(string name, byte[] value)
+		{
 			string newValue = Convert.ToBase64String(value, Base64FormattingOptions.InsertLineBreaks);
 
 			XmlElement el = WriteAsElement(name, newValue);
+
 			AddAttribute(el, "array", "true");
 			AddAttribute(el, "encoding", "Base64");
 		}
-		/// <summary>
-		/// Writes an object implementing IXleSerializable to the XML data as an element.
-		/// </summary>
-		/// <param name="name">The name of the XML element used.</param>
-		/// <param name="value">The object data to write.</param>
-		public void Write(string name, IXleSerializable value)
-		{
-			XmlElement element = CreateElement(name);
 
-			if (value == null)
-				AddAttribute(element, "type", "null");
-			else
-			{
-				AddAttribute(element, "type", value.GetType().ToString());
 
-				nodes.Push(element);
-
-				Serialize(value);
-
-				nodes.Pop();
-			}
-		}
-
 		/// <summary>
 		/// Writes an array of objects implementing IXleSerializable to the XML data as an element.
 		/// </summary>
@@ -496,11 +525,11 @@
 		/// </summary>
 		/// <param name="name">The name of the XML element used.</param>
 		/// <param name="value">The list data to write.</param>
-		public void Write(string name, List<string> value) 
+		public void Write(string name, List<string> value)
 		{
 			XmlElement element = CreateElement(name);
 			AddAttribute(element, "array", "true");
-			
+
 			nodes.Push(element);
 
 			for (int i = 0; i < value.Count; i++)
@@ -619,36 +648,50 @@
 			nodes.Pop();
 		}
 
-		private XmlElement WriteAsElement<T>(string name, T value) where T : IConvertible
+		#endregion
+		#region --- Writing Streams ---
+
+		/// <summary>
+		/// Writes a binary stream to the XML data as an element.  
+		/// Compresses the stream using GZip compression.
+		/// </summary>
+		/// <param name="name">The name of the XML element used.</param>
+		/// <param name="value">The stream of data to write.</param>
+		public void Write(string name, Stream value)
 		{
-			XmlElement element = doc.CreateElement(name);
-
-			element.InnerText = value.ToString();
-
-			CurrentNode.AppendChild(element);
-
-			return element;
+			Write(name, value, CompressionType.GZip);
 		}
-		private void WriteAsAttribute<T>(string name, T value) where T : IConvertible
+		/// <summary>
+		/// Writes a binary stream to the XML data as an element.
+		/// </summary>
+		/// <param name="name">The name of the XML element used.</param>
+		/// <param name="value">The stream of data to write.</param>
+		/// <param name="compression">The compression algorithm to use.</param>
+		public void Write(string name, Stream value, CompressionType compression)
 		{
-			AddAttribute(CurrentNode, name, Convert.ToString(value));
+			WriteImpl(name, value, compression);
 		}
 
-		private XmlElement CreateElement(string name)
+		private void WriteImpl(string name, Stream value, CompressionType compression)
 		{
-			XmlElement element = doc.CreateElement(name);
+			MemoryStream ms = new MemoryStream();
+			Stream compressed = TranslateStream(ms, compression, CompressionMode.Compress);
 
-			for (int i = 0; i < CurrentNode.ChildNodes.Count; i++)
-			{
-				if (CurrentNode.ChildNodes[i].Name == name)
-					throw new XleSerializationException("The name " + name + " already exists.");
-			}
+			byte[] uncompressedData = ReadFromStream(value);
+			compressed.Write(uncompressedData, 0, uncompressedData.Length);
 
-			CurrentNode.AppendChild(element);
+			byte[] buffer = ms.GetBuffer();
 
-			return element;
+			string newValue = Convert.ToBase64String(
+				buffer/*, Base64FormattingOptions.InsertLineBreaks*/);
+
+			XmlElement el = WriteAsElement(name, newValue);
+			AddAttribute(el, "stream", "true");
+			AddAttribute(el, "compression", compression.ToString());
+			AddAttribute(el, "encoding", "Base64");
 		}
 
+		#endregion
 
 		#endregion
 		#region --- Reading methods ---
@@ -673,130 +716,9 @@
 			return true;
 		}
 
-		private Type GetType(string name)
-		{
-			return Binder.GetType(name);
-		}
+		#region --- Reading single values ---
 
 		/// <summary>
-		/// Reads a dictionary type from the XML data.
-		/// The key type must implement IConvertible and the value type must implement
-		/// IXleSerializable.
-		/// </summary>
-		/// <typeparam name="TKey"></typeparam>
-		/// <typeparam name="TValue"></typeparam>
-		/// <param name="name"></param>
-		/// <returns></returns>
-		[CLSCompliant(false)]
-		public Dictionary<TKey, TValue> ReadDictionary<TKey, TValue>(string name)
-			where TKey : IConvertible
-			where TValue : IXleSerializable
-		{
-			XmlElement element = (XmlElement)CurrentNode[name];
-
-			if (element == null)
-				throw new XleSerializationException("Node " + name + " was not found.");
-
-			nodes.Push(element);
-
-			Dictionary<TKey, TValue> retval = new Dictionary<TKey, TValue>();
-
-			for (int i = 0; i < element.ChildNodes.Count; i++)
-			{
-				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
-				string keyString = current.GetAttribute("key");
-				TKey key = (TKey)Convert.ChangeType(keyString, typeof(TKey));
-
-				nodes.Push(current);
-				TValue val = (TValue)DeserializeObject(typeof(TValue));
-				nodes.Pop();
-
-				retval.Add(key, val);
-			}
-
-			nodes.Pop();
-
-			return retval;
-		}
-		/// <summary>
-		/// Reads a dictionary type of strings from the XML data.
-		/// The key type must implement IConvertible and the value type must implement
-		/// IXleSerializable.
-		/// </summary>
-		/// <typeparam name="Tkey">The key type of the dictionary.</typeparam>
-		/// <param name="name">The name of the element in the XML stream to decode.</param>
-		/// <returns></returns> 
-		[CLSCompliant(false)]
-		[Obsolete("Use ReadDictionaryString instead.")]
-		public Dictionary<Tkey, string> ReadDictionary<Tkey>(string name)
-			where Tkey : IConvertible 
-		{
-			return ReadDictionaryString<Tkey>(name);
-		}
-		/// <summary>
-		/// Reads a dictionary type of strings from the XML data.
-		/// The key type must implement IConvertible and the value type must implement
-		/// IXleSerializable.
-		/// </summary>
-		/// <typeparam name="Tkey">The key type of the dictionary.</typeparam>
-		/// <param name="name">The name of the element in the XML stream to decode.</param>
-		/// <returns></returns> 
-		[CLSCompliant(false)]
-		public Dictionary<Tkey, string> ReadDictionaryString<Tkey>(string name)
-			where Tkey : IConvertible
-		{
-			XmlElement element = (XmlElement)CurrentNode[name];
-
-			nodes.Push(element);
-
-			Dictionary<Tkey, string> retval = new Dictionary<Tkey, string>();
-
-			for (int i = 0; i < element.ChildNodes.Count; i++)
-			{
-				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
-				string keyString = current.GetAttribute("key");
-				Tkey key = (Tkey)Convert.ChangeType(keyString, typeof(Tkey));
-
-				string valueString = current.GetAttribute("value");
-
-				retval.Add(key, valueString);
-			}
-
-			nodes.Pop();
-
-			return retval;
-		}
-
-		/// <summary>
-		/// Reads a dictionary of the form Dictionary&lt;Tkey, int&gt;.
-		/// </summary>
-		/// <typeparam name="Tkey"></typeparam>
-		/// <param name="name"></param>
-		/// <returns></returns>
-		public Dictionary<Tkey, int> ReadDictionaryInt32<Tkey>(string name)
-		{
-			XmlElement element = (XmlElement)CurrentNode[name];
-
-			nodes.Push(element);
-
-			Dictionary<Tkey, int> retval = new Dictionary<Tkey, int>();
-
-			for (int i = 0; i < element.ChildNodes.Count; i++)
-			{
-				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
-				string keyString = current.GetAttribute("key");
-				Tkey key = (Tkey)Convert.ChangeType(keyString, typeof(Tkey));
-
-				string valueString = current.GetAttribute("value");
-
-				retval.Add(key, int.Parse(valueString));
-			}
-
-			nodes.Pop();
-
-			return retval;
-		}
-		/// <summary>
 		/// Reads an object from the XML data.
 		/// </summary>
 		/// <param name="name"></param>
@@ -851,48 +773,7 @@
 		{
 			return ReadStringImpl(name, false, string.Empty);
 		}
-		/// <summary>
-		/// Reads binary data stored as a stream.
-		/// </summary>
-		/// <param name="name"></param>
-		/// <returns></returns>
-		public Stream ReadStream(string name)
-		{
-			XmlElement element = (XmlElement)CurrentNode[name];
 
-			if (element == null)
-				throw new XleSerializationException("Field " + name + " was not found.");
-
-			if (element.Attributes["stream"] == null || element.Attributes["stream"].Value != "true")
-				throw new XleSerializationException("Field " + name + " is not a stream.");
-			if (element.Attributes["encoding"] == null)
-				throw new XleSerializationException("Field " + name + " does not have encoding information.");
-
-			string encoding = element.Attributes["encoding"].Value;
-			byte[] bytes;
-
-			if (encoding == "Base64")
-			{
-				bytes = Convert.FromBase64String(element.InnerText);
-			}
-			else
-				throw new XleSerializationException("Unrecognized encoding " + encoding);
-
-			CompressionType compression = CompressionType.None;
-
-			if (element.Attributes["compression"] != null)
-			{
-				compression = (CompressionType)
-					Enum.Parse(typeof(CompressionType), element.Attributes["compression"].Value, true);
-			}
-
-			MemoryStream ms = new MemoryStream(bytes);
-			ms.Position = 0;
-			Stream uncompressed = TranslateStream(ms, compression, CompressionMode.Decompress);
-
-			return uncompressed;
-		}
-
 		private string ReadStringImpl(string name, bool haveDefault, string defaultValue)
 		{
 			string attribute = CurrentNode.GetAttribute(name);
@@ -1068,7 +949,49 @@
 
 			return float.Parse(element.InnerText);
 		}
+
+		#endregion
+		#region --- Reading array values ---
+
+		private string GetEncoding(string name)
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
+
+			if (element == null)
+				throw new XleSerializationException("Node " + name + " not found.");
+			if (element.Attributes["encoding"] == null)
+				throw new XleSerializationException("Element " + name + " does not have encoding information.");
+
+			return element.Attributes["encoding"].Value;
+		}
+
 		/// <summary>
+		/// Reads a byte array from the XML data.  If the name is not present 
+		/// an XleSerializationException is thrown.
+		/// </summary>
+		/// <param name="name">Name of the field.</param>
+		/// <returns></returns>
+		public byte[] ReadByteArray(string name)
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
+
+			string encoding = GetEncoding(name);
+
+			if (element.Attributes["array"] == null || element.Attributes["array"].Value != "true")
+				throw new XleSerializationException("Element " + name + " is not an array.");
+
+			if (encoding == "Base64")
+			{
+				byte[] array = Convert.FromBase64String(element.InnerText);
+				return array;
+			}
+			else
+			{
+				throw new XleSerializationException("Unrecognized encoding " + element.Attributes["encoding"]);
+			}
+		}
+
+		/// <summary>
 		/// Reads a integer array from the XML data.  If the name is not present 
 		/// an XleSerializationException is thrown.
 		/// </summary>
@@ -1076,25 +999,46 @@
 		/// <returns></returns>
 		public int[] ReadInt32Array(string name)
 		{
-			byte[] array = ReadByteArray(name);
-			int[] result = new int[array.Length / 4];
+			XmlElement element = (XmlElement)CurrentNode[name];
+			string encoding = GetEncoding(name);
+			int[] result;
 
-			if (array.Length % 4 != 0)
-				throw new XleSerializationException("Encoded array is wrong size!");
+			switch ((NumericEncoding)Enum.Parse(typeof(NumericEncoding), encoding))
+			{
+				case NumericEncoding.Base64:
+					byte[] array = ReadByteArray(name);
+					result = new int[array.Length / 4];
 
-			if (array.Length > 0)
-			{
-				unsafe
-				{
-					fixed (byte* ar = array)
+					if (array.Length % 4 != 0)
+						throw new XleSerializationException("Encoded array is wrong size!");
+
+					if (array.Length > 0)
 					{
-						Marshal.Copy((IntPtr)ar, result, 0, result.Length);
+						unsafe
+						{
+							fixed (byte* ar = array)
+							{
+								Marshal.Copy((IntPtr)ar, result, 0, result.Length);
+							}
+						}
 					}
-				}
+
+					return result;
+
+				case NumericEncoding.Csv:
+					string value = element.InnerText;
+					string[] vals = value.Split(new char[] { ',' }, 
+									StringSplitOptions.RemoveEmptyEntries);
+
+					result = vals.Select(x => int.Parse(x)).ToArray();
+
+					return result;
+
+				default:
+					throw new XleSerializationException("Encoding information could not be parsed.");
 			}
+		}
 
-			return result;
-		}
 		/// <summary>
 		/// Reads a boolean array from the XML data.  If the name is not present 
 		/// an XleSerializationException is thrown.
@@ -1203,7 +1147,7 @@
 				{
 					list.Add(item.InnerText);
 				}
-				else 
+				else
 				{
 					nodes.Push(item);
 
@@ -1236,50 +1180,190 @@
 			else
 				ar = ReadArrayImpl(name, typeof(T));
 
-			List<T> retval = new List<T>();
-			retval.AddRange((T[])ar);
+			return ((T[])ar).ToList();
+		}
 
+		/// <summary>
+		/// Reads a dictionary type from the XML data.
+		/// The key type must implement IConvertible and the value type must implement
+		/// IXleSerializable.
+		/// </summary>
+		/// <typeparam name="TKey"></typeparam>
+		/// <typeparam name="TValue"></typeparam>
+		/// <param name="name"></param>
+		/// <returns></returns>
+		[CLSCompliant(false)]
+		public Dictionary<TKey, TValue> ReadDictionary<TKey, TValue>(string name)
+			where TKey : IConvertible
+			where TValue : IXleSerializable
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
+
+			if (element == null)
+				throw new XleSerializationException("Node " + name + " was not found.");
+
+			nodes.Push(element);
+
+			Dictionary<TKey, TValue> retval = new Dictionary<TKey, TValue>();
+
+			for (int i = 0; i < element.ChildNodes.Count; i++)
+			{
+				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
+				string keyString = current.GetAttribute("key");
+				TKey key = (TKey)Convert.ChangeType(keyString, typeof(TKey));
+
+				nodes.Push(current);
+				TValue val = (TValue)DeserializeObject(typeof(TValue));
+				nodes.Pop();
+
+				retval.Add(key, val);
+			}
+
+			nodes.Pop();
+
 			return retval;
 		}
+		/// <summary>
+		/// Reads a dictionary type of strings from the XML data.
+		/// The key type must implement IConvertible and the value type must implement
+		/// IXleSerializable.
+		/// </summary>
+		/// <typeparam name="Tkey">The key type of the dictionary.</typeparam>
+		/// <param name="name">The name of the element in the XML stream to decode.</param>
+		/// <returns></returns> 
+		[CLSCompliant(false)]
+		[Obsolete("Use ReadDictionaryString instead.")]
+		public Dictionary<Tkey, string> ReadDictionary<Tkey>(string name)
+			where Tkey : IConvertible
+		{
+			return ReadDictionaryString<Tkey>(name);
+		}
+		/// <summary>
+		/// Reads a dictionary type of strings from the XML data.
+		/// The key type must implement IConvertible and the value type must implement
+		/// IXleSerializable.
+		/// </summary>
+		/// <typeparam name="Tkey">The key type of the dictionary.</typeparam>
+		/// <param name="name">The name of the element in the XML stream to decode.</param>
+		/// <returns></returns> 
+		[CLSCompliant(false)]
+		public Dictionary<Tkey, string> ReadDictionaryString<Tkey>(string name)
+			where Tkey : IConvertible
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
 
+			nodes.Push(element);
 
+			Dictionary<Tkey, string> retval = new Dictionary<Tkey, string>();
+
+			for (int i = 0; i < element.ChildNodes.Count; i++)
+			{
+				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
+				string keyString = current.GetAttribute("key");
+				Tkey key = (Tkey)Convert.ChangeType(keyString, typeof(Tkey));
+
+				string valueString = current.GetAttribute("value");
+
+				retval.Add(key, valueString);
+			}
+
+			nodes.Pop();
+
+			return retval;
+		}
+
 		/// <summary>
-		/// Reads a byte array from the XML data.  If the name is not present 
-		/// an XleSerializationException is thrown.
+		/// Reads a dictionary of the form Dictionary&lt;Tkey, int&gt;.
 		/// </summary>
-		/// <param name="name">Name of the field.</param>
+		/// <typeparam name="Tkey"></typeparam>
+		/// <param name="name"></param>
 		/// <returns></returns>
-		public byte[] ReadByteArray(string name)
+		public Dictionary<Tkey, int> ReadDictionaryInt32<Tkey>(string name)
 		{
 			XmlElement element = (XmlElement)CurrentNode[name];
 
+			nodes.Push(element);
+
+			Dictionary<Tkey, int> retval = new Dictionary<Tkey, int>();
+
+			for (int i = 0; i < element.ChildNodes.Count; i++)
+			{
+				XmlElement current = (XmlElement)CurrentNode.ChildNodes[i];
+				string keyString = current.GetAttribute("key");
+				Tkey key = (Tkey)Convert.ChangeType(keyString, typeof(Tkey));
+
+				string valueString = current.GetAttribute("value");
+
+				retval.Add(key, int.Parse(valueString));
+			}
+
+			nodes.Pop();
+
+			return retval;
+		}
+
+		#endregion
+		#region --- Reading streams ---
+		/// <summary>
+		/// Reads binary data stored as a stream.
+		/// </summary>
+		/// <param name="name"></param>
+		/// <returns></returns>
+		public Stream ReadStream(string name)
+		{
+			XmlElement element = (XmlElement)CurrentNode[name];
+
 			if (element == null)
-				throw new XleSerializationException("Node " + name + " not found.");
+				throw new XleSerializationException("Field " + name + " was not found.");
 
-			if (element.Attributes["array"] == null || element.Attributes["array"].Value != "true")
-				throw new XleSerializationException("Element " + name + " is not an array.");
+			if (element.Attributes["stream"] == null || element.Attributes["stream"].Value != "true")
+				throw new XleSerializationException("Field " + name + " is not a stream.");
 			if (element.Attributes["encoding"] == null)
-				throw new XleSerializationException("Element " + name + " does not have encoding information.");
+				throw new XleSerializationException("Field " + name + " does not have encoding information.");
 
-			if (element.Attributes["encoding"].Value == "Base64")
+			string encoding = element.Attributes["encoding"].Value;
+			byte[] bytes;
+
+			if (encoding == "Base64")
 			{
-				byte[] array = Convert.FromBase64String(element.InnerText);
-				return array;
+				bytes = Convert.FromBase64String(element.InnerText);
 			}
 			else
+				throw new XleSerializationException("Unrecognized encoding " + encoding);
+
+			CompressionType compression = CompressionType.None;
+
+			if (element.Attributes["compression"] != null)
 			{
-				throw new XleSerializationException("Unrecognized encoding " + element.Attributes["encoding"]);
+				compression = (CompressionType)
+					Enum.Parse(typeof(CompressionType), element.Attributes["compression"].Value, true);
 			}
 
+			MemoryStream ms = new MemoryStream(bytes);
+			ms.Position = 0;
+			Stream uncompressed = TranslateStream(ms, compression, CompressionMode.Decompress);
+
+			return uncompressed;
 		}
 
+		#endregion
 
+		#endregion
+		#region --- Type Binding ---
 
+		private Type GetType(string name)
+		{
+			return Binder.GetType(name);
+		}
+
+		/// <summary>
+		/// The ITypeBinder object used.
+		/// </summary>
+		public ITypeBinder Binder { get; internal set; }
+
 		#endregion
-
 		#region --- Dealing with streams ---
 
-
 		/// <summary>
 		/// Reads data from a stream until the end is reached. The
 		/// data is returned as a byte array. An IOException is
@@ -1303,7 +1387,6 @@
 			}
 		}
 
-
 		private Stream TranslateStream(Stream value, CompressionType compression, CompressionMode mode)
 		{
 			switch (compression)

Modified: trunk/Tools/FontCreator/FontCreator.csproj
===================================================================
--- trunk/Tools/FontCreator/FontCreator.csproj	2012-02-27 20:12:52 UTC (rev 1336)
+++ trunk/Tools/FontCreator/FontCreator.csproj	2012-03-06 05:28:04 UTC (rev 1337)
@@ -124,6 +124,10 @@
       <Name>AgateLib</Name>
       <Project>{9490B719-829E-43A7-A5FE-8001F8A81759}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\Drivers\AgateDrawing\AgateDrawing.csproj">
+      <Project>{164A785D-924E-40FB-A517-D7E677F3B53A}</Project>
+      <Name>AgateDrawing</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Drivers\AgateLib.WinForms\AgateLib.WinForms.csproj">
       <Name>AgateLib.WinForms</Name>
       <Project>{BEF6D67B-4C84-4D3E-8047-6DB2C8754D77}</Project>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2009	Jan	Feb	Mar	Apr (86)	May (77)	Jun	Jul (1)	Aug (31)	Sep (12)	Oct (31)	Nov (53)	Dec (39)
2010	Jan (53)	Feb (14)	Mar	Apr	May	Jun	Jul	Aug (2)	Sep	Oct	Nov (7)	Dec (13)
2011	Jan (17)	Feb (5)	Mar (1)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct (10)	Nov (21)	Dec
2012	Jan (6)	Feb (14)	Mar (5)	Apr (4)	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2013	Jan (1)	Feb (8)	Mar (1)	Apr	May	Jun	Jul	Aug (2)	Sep (1)	Oct (5)	Nov (9)	Dec (5)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (3)	May	Jun (5)	Jul (33)	Aug (69)	Sep (35)	Oct (4)	Nov (1)	Dec

agate-svn-commit Mailing List for AgateLib (Page 9)

agate-svn-commit — List with automated subversion commit messages.