Browse Source

Use consistent naming for TypeConverters.

pull/145/head
Steven Kirk 11 years ago
parent
commit
63e2870f3b
  1. 4
      Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs
  2. 6
      src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
  3. 2
      src/Markup/Perspex.Markup.Xaml/Converters/ClassesTypeConverter.cs
  4. 2
      src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyTypeConverter.cs
  5. 2
      src/Markup/Perspex.Markup.Xaml/Converters/SelectorTypeConverter.cs
  6. 6
      src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

4
Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs

@ -22,7 +22,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Converters
[Fact] [Fact]
public void ConvertFrom_Finds_Fully_Qualified_Property() public void ConvertFrom_Finds_Fully_Qualified_Property()
{ {
var target = new PerspexPropertyConverter(); var target = new PerspexPropertyTypeConverter();
var context = CreateContext(); var context = CreateContext();
var result = target.ConvertFrom(context, null, "Class1.Foo"); var result = target.ConvertFrom(context, null, "Class1.Foo");
} }
@ -30,7 +30,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Converters
[Fact] [Fact]
public void ConvertFrom_Finds_Attached_Property() public void ConvertFrom_Finds_Attached_Property()
{ {
var target = new PerspexPropertyConverter(); var target = new PerspexPropertyTypeConverter();
var context = CreateContext(); var context = CreateContext();
var result = target.ConvertFrom(context, null, "AttachedOwner.Attached"); var result = target.ConvertFrom(context, null, "AttachedOwner.Attached");
} }

6
src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs

@ -77,13 +77,13 @@ namespace Perspex.Markup.Xaml.Context
{ {
new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()), new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()),
new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()), new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()),
new TypeConverterRegistration(typeof(Classes), new ClassesConverter()), new TypeConverterRegistration(typeof(Classes), new ClassesTypeConverter()),
new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()), new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()),
new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()), new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()),
new TypeConverterRegistration(typeof(PerspexProperty), new PerspexPropertyConverter()), new TypeConverterRegistration(typeof(PerspexProperty), new PerspexPropertyTypeConverter()),
new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()), new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()),
new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()), new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()),
new TypeConverterRegistration(typeof(Selector), new SelectorConverter()), new TypeConverterRegistration(typeof(Selector), new SelectorTypeConverter()),
}; };
typeConverterProvider.AddAll(converters); typeConverterProvider.AddAll(converters);

2
src/Markup/Perspex.Markup.Xaml/Converters/ClassesConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/ClassesTypeConverter.cs

@ -8,7 +8,7 @@ using Perspex.Styling;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class ClassesConverter : ITypeConverter public class ClassesTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

2
src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyTypeConverter.cs

@ -10,7 +10,7 @@ using Perspex.Styling;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class PerspexPropertyConverter : ITypeConverter public class PerspexPropertyTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

2
src/Markup/Perspex.Markup.Xaml/Converters/SelectorConverter.cs → src/Markup/Perspex.Markup.Xaml/Converters/SelectorTypeConverter.cs

@ -8,7 +8,7 @@ using Perspex.Markup.Xaml.Parsers;
namespace Perspex.Markup.Xaml.Converters namespace Perspex.Markup.Xaml.Converters
{ {
public class SelectorConverter : ITypeConverter public class SelectorTypeConverter : ITypeConverter
{ {
public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType) public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
{ {

6
src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@ -38,12 +38,12 @@
<Compile Include="..\..\Shared\SharedAssemblyInfo.cs"> <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
<Link>Properties\SharedAssemblyInfo.cs</Link> <Link>Properties\SharedAssemblyInfo.cs</Link>
</Compile> </Compile>
<Compile Include="Converters\ClassesConverter.cs" /> <Compile Include="Converters\ClassesTypeConverter.cs" />
<Compile Include="Converters\RowDefinitionsTypeConverter.cs" /> <Compile Include="Converters\RowDefinitionsTypeConverter.cs" />
<Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" /> <Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" />
<Compile Include="Converters\ThicknessTypeConverter.cs" /> <Compile Include="Converters\ThicknessTypeConverter.cs" />
<Compile Include="Converters\PerspexPropertyConverter.cs" /> <Compile Include="Converters\PerspexPropertyTypeConverter.cs" />
<Compile Include="Converters\SelectorConverter.cs" /> <Compile Include="Converters\SelectorTypeConverter.cs" />
<Compile Include="Context\PerspexWiringContext.cs" /> <Compile Include="Context\PerspexWiringContext.cs" />
<Compile Include="MarkupExtensions\BindingExtension.cs" /> <Compile Include="MarkupExtensions\BindingExtension.cs" />
<Compile Include="Converters\BrushTypeConverter.cs" /> <Compile Include="Converters\BrushTypeConverter.cs" />

Loading…
Cancel
Save