Change `ISolidBrushPropertyInfo` into `IColorSpaced`

5 files changed, 8 insertions, 7 deletions

diff --git a/Xamarin.PropertyEditing.Tests/SolidBrushPropertyViewModelTests.cs b/Xamarin.PropertyEditing.Tests/SolidBrushPropertyViewModelTests.cs
index 2803278..ebd4a19 100644
--- a/Xamarin.PropertyEditing.Tests/SolidBrushPropertyViewModelTests.cs
+++ b/Xamarin.PropertyEditing.Tests/SolidBrushPropertyViewModelTests.cs
@@ -26,9 +26,9 @@ namespace Xamarin.PropertyEditing.Tests
 		[Test]
 		public void ColorSpaces ()
 		{
-			var mockProperty = new Mock<ISolidBrushPropertyInfo> ();
+			var mockProperty = new Mock<IPropertyInfo> ();
 			mockProperty.SetupGet (pi => pi.Type).Returns (typeof (SolidBrush));
-			mockProperty.SetupGet (pi => pi.ColorSpaces).Returns (SampleColorSpaces);
+			mockProperty.As<IColorSpaced>().SetupGet (pi => pi.ColorSpaces).Returns (SampleColorSpaces);
 			var mockEditor = new Mock<IObjectEditor> ();
 
 			var vm = new SolidBrushPropertyViewModel(mockProperty.Object, new[] { mockEditor.Object });
diff --git a/Xamarin.PropertyEditing/ISolidBrushPropertyInfo.cs b/Xamarin.PropertyEditing/IColorSpaced.cs
index c797459..4af13dd 100644
--- a/Xamarin.PropertyEditing/ISolidBrushPropertyInfo.cs
+++ b/Xamarin.PropertyEditing/IColorSpaced.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 namespace Xamarin.PropertyEditing
 {
 	// TODO: Add support for predefined color values
-	public interface ISolidBrushPropertyInfo : IPropertyInfo
+	public interface IColorSpaced
 	{
 		IReadOnlyList<string> ColorSpaces { get; }
 	}
diff --git a/Xamarin.PropertyEditing/Reflection/ReflectionSolidBrushPropertyInfo.cs b/Xamarin.PropertyEditing/Reflection/ReflectionSolidBrushPropertyInfo.cs
index 6bc94b2..a497ca6 100644
--- a/Xamarin.PropertyEditing/Reflection/ReflectionSolidBrushPropertyInfo.cs
+++ b/Xamarin.PropertyEditing/Reflection/ReflectionSolidBrushPropertyInfo.cs
@@ -4,7 +4,7 @@ using System.Reflection;
 
 namespace Xamarin.PropertyEditing.Reflection
 {
-	public class ReflectionSolidBrushPropertyInfo : ReflectionPropertyInfo, ISolidBrushPropertyInfo
+	public class ReflectionSolidBrushPropertyInfo : ReflectionPropertyInfo, IColorSpaced
 	{
 		public ReflectionSolidBrushPropertyInfo (PropertyInfo propertyInfo, IEnumerable<string> colorSpaces = null)
 			: base (propertyInfo)
diff --git a/Xamarin.PropertyEditing/ViewModels/SolidBrushPropertyViewModel.cs b/Xamarin.PropertyEditing/ViewModels/SolidBrushPropertyViewModel.cs
index c592369..4da2bfc 100644
--- a/Xamarin.PropertyEditing/ViewModels/SolidBrushPropertyViewModel.cs
+++ b/Xamarin.PropertyEditing/ViewModels/SolidBrushPropertyViewModel.cs
@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
+using Xamarin.PropertyEditing;
 using Xamarin.PropertyEditing.Drawing;
 
 namespace Xamarin.PropertyEditing.ViewModels
 {
-	internal class SolidBrushPropertyViewModel : PropertyViewModel<CommonSolidBrush>
+	internal class SolidBrushPropertyViewModel : PropertyViewModel<CommonSolidBrush>, IColorSpaced
 	{
 		public SolidBrushPropertyViewModel(IPropertyInfo property, IEnumerable<IObjectEditor> editors)
 			: base(property, editors)
 		{
-			var solidBrushPropertyInfo = property as ISolidBrushPropertyInfo;
+			var solidBrushPropertyInfo = property as IColorSpaced;
 			if (solidBrushPropertyInfo == null)
 				throw new ArgumentException ("Property doesn't implement ISolidBrushPropertyInfo", nameof (property));
 
diff --git a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
index abcac8f..ca95b06 100644
--- a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
+++ b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
@@ -61,6 +61,7 @@
     <Compile Include="Drawing\CommonImageBrush.cs" />
     <Compile Include="IAvailabilityConstraint.cs" />
     <Compile Include="IClampedPropertyInfo.cs" />
+    <Compile Include="IColorSpaced.cs" />
     <Compile Include="IEditorProvider.cs" />
     <Compile Include="IObjectEventEditor.cs" />
     <Compile Include="IEventInfo.cs" />
@@ -70,7 +71,6 @@
     <Compile Include="IPropertyInfo.cs" />
     <Compile Include="IResourceProvider.cs" />
     <Compile Include="ISelfConstrainedPropertyInfo.cs" />
-    <Compile Include="ISolidBrushPropertyInfo.cs" />
     <Compile Include="NotifyingObject.cs" />
     <Compile Include="ObservableCollectionEx.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />