From 521771d2543a031c36de41926d7f9c20e23c7eed Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 2 Oct 2015 20:24:17 +0200 Subject: [PATCH] Removed unused class/interface. --- .../Binding/IPerspexPropertyBinder.cs | 19 ------ .../Binding/PerspexPropertyBinder.cs | 62 ------------------- .../Context/PerspexTypeRepository.cs | 7 +-- .../Context/PerspexWiringContext.cs | 3 +- .../Context/PerspexXamlMember.cs | 8 +-- .../Context/PerspexXamlMemberValuePlugin.cs | 7 +-- .../Context/PerspexXamlType.cs | 10 +-- .../Perspex.Markup.Xaml.csproj | 2 - 8 files changed, 10 insertions(+), 108 deletions(-) delete mode 100644 src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs delete mode 100644 src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs diff --git a/src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs deleted file mode 100644 index a98f32e7f1..0000000000 --- a/src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) The Perspex Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System.Collections.Generic; -using OmniXaml.TypeConversion; - -namespace Perspex.Markup.Xaml.Binding -{ - public interface IPerspexPropertyBinder - { - ITypeConverterProvider TypeConverterProvider { get; } - - XamlBinding GetBinding(PerspexObject po, PerspexProperty pp); - - IEnumerable GetBindings(PerspexObject source); - - XamlBinding Create(XamlBindingDefinition xamlBinding); - } -} \ No newline at end of file diff --git a/src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs deleted file mode 100644 index 9e4eee4b84..0000000000 --- a/src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) The Perspex Project. All rights reserved. -// Licensed under the MIT license. See licence.md file in the project root for full license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using OmniXaml.TypeConversion; - -namespace Perspex.Markup.Xaml.Binding -{ - public class PerspexPropertyBinder : IPerspexPropertyBinder - { - private readonly HashSet _bindings; - - public PerspexPropertyBinder(ITypeConverterProvider typeConverterProvider) - { - TypeConverterProvider = typeConverterProvider; - _bindings = new HashSet(); - } - - public ITypeConverterProvider TypeConverterProvider { get; } - - public XamlBinding GetBinding(PerspexObject po, PerspexProperty pp) - { - throw new NotImplementedException(); - //return _bindings.First(xamlBinding => xamlBinding.Target == po && xamlBinding.TargetProperty == pp); - } - - public IEnumerable GetBindings(PerspexObject source) - { - throw new NotImplementedException(); - //return from binding in _bindings - // where binding.Target == source - // select binding; - } - - public XamlBinding Create(XamlBindingDefinition xamlBinding) - { - throw new NotImplementedException(); - //if (xamlBinding.Target == null) - //{ - // throw new InvalidOperationException(); - //} - - //if (xamlBinding.TargetProperty == null) - //{ - // throw new InvalidOperationException(); - //} - - //var binding = new XamlBinding(TypeConverterProvider) - //{ - // BindingMode = xamlBinding.BindingMode, - // SourcePropertyPath = xamlBinding.SourcePropertyPath, - // Target = xamlBinding.Target, - // TargetProperty = xamlBinding.TargetProperty - //}; - - //_bindings.Add(binding); - //return binding; - } - } -} \ No newline at end of file diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs index f0dcf0a444..44dda9b9f9 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs @@ -12,21 +12,18 @@ namespace Perspex.Markup.Xaml.Context public class PerspexTypeRepository : XamlTypeRepository { private readonly ITypeFactory _typeFactory; - private readonly IPerspexPropertyBinder _propertyBinder; public PerspexTypeRepository(IXamlNamespaceRegistry xamlNamespaceRegistry, ITypeFactory typeFactory, - ITypeFeatureProvider featureProvider, - IPerspexPropertyBinder propertyBinder) : base(xamlNamespaceRegistry, typeFactory, featureProvider) + ITypeFeatureProvider featureProvider) : base(xamlNamespaceRegistry, typeFactory, featureProvider) { _typeFactory = typeFactory; - _propertyBinder = propertyBinder; } public override XamlType GetXamlType(Type type) { Guard.ThrowIfNull(type, nameof(type)); - return new PerspexXamlType(type, this, _typeFactory, FeatureProvider, _propertyBinder); + return new PerspexXamlType(type, this, _typeFactory, FeatureProvider); } } } \ No newline at end of file diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs index e02512fe1e..3e5b5c24c2 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs @@ -43,8 +43,7 @@ namespace Perspex.Markup.Xaml.Context private static ITypeContext CreateTypeContext(ITypeFactory typeFactory, TypeFeatureProvider featureProvider) { var xamlNamespaceRegistry = CreateXamlNamespaceRegistry(); - var perspexPropertyBinder = new PerspexPropertyBinder(featureProvider.ConverterProvider); - var typeRepository = new PerspexTypeRepository(xamlNamespaceRegistry, typeFactory, featureProvider, perspexPropertyBinder); + var typeRepository = new PerspexTypeRepository(xamlNamespaceRegistry, typeFactory, featureProvider); typeRepository.RegisterMetadata(new Metadata().WithMemberDependency(x => x.Value, x => x.Property)); typeRepository.RegisterMetadata( diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs index 172911a6f2..89979885f0 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs @@ -9,21 +9,17 @@ namespace Perspex.Markup.Xaml.Context { public class PerspexXamlMember : XamlMember { - private readonly IPerspexPropertyBinder _propertyBinder; - public PerspexXamlMember(string name, XamlType owner, IXamlTypeRepository xamlTypeRepository, - ITypeFeatureProvider featureProvider, - IPerspexPropertyBinder propertyBinder) + ITypeFeatureProvider featureProvider) : base(name, owner, xamlTypeRepository, featureProvider) { - _propertyBinder = propertyBinder; } protected override IXamlMemberValuePlugin LookupXamlMemberValueConnector() { - return new PerspexXamlMemberValuePlugin(this, _propertyBinder); + return new PerspexXamlMemberValuePlugin(this); } public override string ToString() diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs index c63bbc9a24..fd7a786649 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs @@ -17,12 +17,11 @@ namespace Perspex.Markup.Xaml.Context public class PerspexXamlMemberValuePlugin : MemberValuePlugin { private readonly XamlMember _xamlMember; - private readonly IPerspexPropertyBinder _propertyBinder; - public PerspexXamlMemberValuePlugin(XamlMember xamlMember, IPerspexPropertyBinder propertyBinder) : base(xamlMember) + public PerspexXamlMemberValuePlugin(XamlMember xamlMember) + : base(xamlMember) { _xamlMember = xamlMember; - _propertyBinder = propertyBinder; } public override void SetValue(object instance, object value) @@ -90,7 +89,7 @@ namespace Perspex.Markup.Xaml.Context $"Cannot find '{_xamlMember.Name}' on '{instance.GetType()}"); } - var binding = new XamlBinding(_propertyBinder.TypeConverterProvider) + var binding = new XamlBinding { BindingMode = def.BindingMode, SourcePropertyPath = def.SourcePropertyPath, diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs index 29de09c241..0d1fb218b1 100644 --- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs +++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs @@ -10,22 +10,16 @@ namespace Perspex.Markup.Xaml.Context { public class PerspexXamlType : XamlType { - private readonly IPerspexPropertyBinder _propertyBinder; - public PerspexXamlType(Type type, IXamlTypeRepository typeRepository, ITypeFactory typeFactory, - ITypeFeatureProvider featureProvider, - IPerspexPropertyBinder propertyBinder) : base(type, typeRepository, typeFactory, featureProvider) + ITypeFeatureProvider featureProvider) : base(type, typeRepository, typeFactory, featureProvider) { - _propertyBinder = propertyBinder; } - protected IPerspexPropertyBinder PropertyBinder => _propertyBinder; - protected override XamlMember LookupMember(string name) { - return new PerspexXamlMember(name, this, TypeRepository, FeatureProvider, _propertyBinder); + return new PerspexXamlMember(name, this, TypeRepository, FeatureProvider); } public override string ToString() diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj index 7bfc7dc51a..987b630907 100644 --- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj +++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj @@ -38,8 +38,6 @@ Properties\SharedAssemblyInfo.cs - -