From 95bbce95375cc424c68e3fe28dada42020d29c60 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Thu, 9 Jul 2015 15:39:24 -0400 Subject: [PATCH] Key on DataFormatReference instead of DataFormat --- .../ObjectModelCustomProperty.cs | 12 ++++++------ .../Microsoft/WindowsImage/WIMDataFormat.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.Core/ObjectModelCustomProperty.cs b/CSharp/Libraries/UniversalEditor.Core/ObjectModelCustomProperty.cs index b596698e..97c2ce87 100644 --- a/CSharp/Libraries/UniversalEditor.Core/ObjectModelCustomProperty.cs +++ b/CSharp/Libraries/UniversalEditor.Core/ObjectModelCustomProperty.cs @@ -9,9 +9,9 @@ namespace UniversalEditor { public class ObjectModelCustomPropertyCollection { - private Dictionary> _internalCollection = new Dictionary>(); + private Dictionary> _internalCollection = new Dictionary>(); - public ObjectModelCustomProperty Add(DataFormat dataFormat, string name, object value) + public ObjectModelCustomProperty Add(DataFormatReference dataFormat, string name, object value) { ObjectModelCustomProperty item = new ObjectModelCustomProperty(); item.DataFormat = dataFormat; @@ -31,7 +31,7 @@ namespace UniversalEditor values[name] = item; return item; } - public ObjectModelCustomProperty[] this[DataFormat dataFormat] + public ObjectModelCustomProperty[] this[DataFormatReference dataFormat] { get { @@ -46,7 +46,7 @@ namespace UniversalEditor return list.ToArray(); } } - public ObjectModelCustomProperty this[DataFormat dataFormat, string name] + public ObjectModelCustomProperty this[DataFormatReference dataFormat, string name] { get { @@ -63,8 +63,8 @@ namespace UniversalEditor } } - private DataFormat mvarDataFormat = null; - public DataFormat DataFormat { get { return mvarDataFormat; } set { mvarDataFormat = value; } } + private DataFormatReference mvarDataFormat = null; + public DataFormatReference DataFormat { get { return mvarDataFormat; } set { mvarDataFormat = value; } } private string mvarName = String.Empty; public string Name { get { return mvarName; } set { mvarName = value; } } diff --git a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/WindowsImage/WIMDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/WindowsImage/WIMDataFormat.cs index 1acc9e7c..e9d3eed1 100644 --- a/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/WindowsImage/WIMDataFormat.cs +++ b/CSharp/Plugins/UniversalEditor.Plugins.Microsoft/DataFormats/FileSystem/Microsoft/WindowsImage/WIMDataFormat.cs @@ -107,7 +107,7 @@ namespace UniversalEditor.DataFormats.FileSystem.Microsoft.WindowsImage UniversalEditor.DataFormats.Markup.XML.XMLDataFormat xdf = new Markup.XML.XMLDataFormat(); Document.Load(mom, xdf, new Accessors.StringAccessor(xmlData)); - fsom.CustomProperties.Add(typeof(UniversalEditor.DataFormats.FileSystem.Microsoft.WindowsImage.WIMDataFormat), "XMLDescriptor", mom); + fsom.CustomProperties.Add(MakeReference(), "XMLDescriptor", mom); } #endregion }