From 51180030e16751268acc2bed47e0e78cd8160abb Mon Sep 17 00:00:00 2001
From: alcexhim <alcexhim@gmail.com>
Date: Fri, 26 Dec 2014 00:04:27 -0500
Subject: [PATCH] Implement GetValue() to return a weakly-typed object value
 for the strongly-typed CustomOptionValue value

---
 .../UniversalEditor.Core/CustomOption.cs      | 51 +++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

diff --git a/CSharp/Libraries/UniversalEditor.Core/CustomOption.cs b/CSharp/Libraries/UniversalEditor.Core/CustomOption.cs
index 58958d27..02a666b4 100644
--- a/CSharp/Libraries/UniversalEditor.Core/CustomOption.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/CustomOption.cs
@@ -18,6 +18,11 @@ namespace UniversalEditor
 
 		private bool mvarValue = false;
 		public bool Value { get { return mvarValue; } set { mvarValue = value; } }
+
+		public override object GetValue()
+		{
+			return mvarValue;
+		}
 	}
 	public class CustomOptionGroup : CustomOption
 	{
@@ -34,6 +39,11 @@ namespace UniversalEditor
 
 		private CustomOption.CustomOptionCollection mvarOptions = new CustomOption.CustomOptionCollection();
 		public CustomOption.CustomOptionCollection Options { get { return mvarOptions; } }
+
+		public override object GetValue()
+		{
+			return null;
+		}
 	}
 
 	public class CustomOptionFieldChoice
@@ -119,6 +129,8 @@ namespace UniversalEditor
 			mvarEnabled = enabled;
 			mvarVisible = visible;
 		}
+
+		public abstract object GetValue();
 	}
 
 	public class CustomOptionText : CustomOption
@@ -142,6 +154,11 @@ namespace UniversalEditor
 
 		private string mvarValue = String.Empty;
 		public string Value { get { return mvarValue; } set { mvarValue = value; } }
+
+		public override object GetValue()
+		{
+			return mvarValue;
+		}
 	}
 	public class CustomOptionChoice : CustomOption
 	{
@@ -204,6 +221,12 @@ namespace UniversalEditor
 
 		private CustomOptionFieldChoice mvarValue = null;
 		public CustomOptionFieldChoice Value { get { return mvarValue; } set { mvarValue = value; } }
+
+		public override object GetValue()
+		{
+			if (mvarValue == null) return null;
+			return mvarValue.Value;
+		}
 	}
 
 	public class DataFormatOptionNumberSuggestedValue
@@ -254,6 +277,11 @@ namespace UniversalEditor
 			mvarMaximumValue = maximumValue;
 			mvarDefaultValue = defaultValue;
 		}
+
+		public override object GetValue()
+		{
+			return mvarValue;
+		}
 	}
 	public class CustomOptionMultipleChoice : CustomOption
 	{
@@ -267,6 +295,11 @@ namespace UniversalEditor
 		{
 
 		}
+
+		public override object GetValue()
+		{
+			return null;
+		}
 	}
 
 	public enum CustomOptionFileDialogMode
@@ -294,16 +327,26 @@ namespace UniversalEditor
 
 		private CustomOptionFileDialogMode mvarDialogMode = CustomOptionFileDialogMode.Open;
 		public CustomOptionFileDialogMode DialogMode { get { return mvarDialogMode; } set { mvarDialogMode = value; } }
+
+		public override object GetValue()
+		{
+			return mvarValue;
+		}
 	}
 	public class CustomOptionVersion : CustomOption
 	{
-		private Version mvarDefaultValue = null;
-		public Version DefaultValue { get { return mvarDefaultValue; } set { mvarDefaultValue = value; } }
+		private Version mvarValue = null;
+		public Version Value { get { return mvarValue; } set { mvarValue = value; } }
 
-		public CustomOptionVersion(string propertyName, string title, Version defaultValue = null, bool enabled = true, bool visible = true)
+		public CustomOptionVersion(string propertyName, string title, Version value = null, bool enabled = true, bool visible = true)
 			: base(propertyName, title, enabled, visible)
 		{
-			mvarDefaultValue = defaultValue;
+			mvarValue = value;
+		}
+
+		public override object GetValue()
+		{
+			return mvarValue;
 		}
 	}
 }