@@ -19,8 +19,7 @@ internal XamlServiceProvider(INode node, HydratationContext context)
19
19
IRootObjectProvider = new XamlRootObjectProvider ( context . RootElement ) ;
20
20
if ( node != null )
21
21
{
22
- IXamlTypeResolver = new XamlTypeResolver ( node . NamespaceResolver , XamlParser . GetElementType ,
23
- context . RootElement . GetType ( ) . GetTypeInfo ( ) . Assembly ) ;
22
+ IXamlTypeResolver = new XamlTypeResolver ( node . NamespaceResolver , context . RootElement . GetType ( ) . GetTypeInfo ( ) . Assembly ) ;
24
23
25
24
var enode = node ;
26
25
while ( enode != null && ! ( enode is IElementNode ) )
@@ -171,25 +170,15 @@ object IProvideValueTarget.TargetProperty
171
170
public class XamlTypeResolver : IXamlTypeResolver
172
171
{
173
172
readonly Assembly currentAssembly ;
174
- readonly GetTypeFromXmlName getTypeFromXmlName ;
175
173
readonly IXmlNamespaceResolver namespaceResolver ;
176
174
177
- public XamlTypeResolver ( IXmlNamespaceResolver namespaceResolver , Assembly currentAssembly )
178
- : this ( namespaceResolver , XamlParser . GetElementType , currentAssembly )
179
- {
180
- }
181
-
182
- internal XamlTypeResolver ( IXmlNamespaceResolver namespaceResolver , GetTypeFromXmlName getTypeFromXmlName ,
183
- Assembly currentAssembly )
175
+ internal XamlTypeResolver ( IXmlNamespaceResolver namespaceResolver , Assembly currentAssembly )
184
176
{
185
177
this . currentAssembly = currentAssembly ;
186
178
if ( namespaceResolver == null )
187
179
throw new ArgumentNullException ( ) ;
188
- if ( getTypeFromXmlName == null )
189
- throw new ArgumentNullException ( ) ;
190
180
191
181
this . namespaceResolver = namespaceResolver ;
192
- this . getTypeFromXmlName = getTypeFromXmlName ;
193
182
}
194
183
195
184
Type IXamlTypeResolver . Resolve ( string qualifiedTypeName , IServiceProvider serviceProvider )
@@ -242,11 +231,8 @@ Type Resolve(string qualifiedTypeName, IServiceProvider serviceProvider, out Xam
242
231
return null ;
243
232
}
244
233
245
- return getTypeFromXmlName ( new XmlType ( namespaceuri , name , null ) , xmlLineInfo , currentAssembly , out exception ) ;
234
+ return XamlParser . GetElementType ( new XmlType ( namespaceuri , name , null ) , xmlLineInfo , currentAssembly , out exception ) ;
246
235
}
247
-
248
- internal delegate Type GetTypeFromXmlName (
249
- XmlType xmlType , IXmlLineInfo xmlInfo , Assembly currentAssembly , out XamlParseException exception ) ;
250
236
}
251
237
252
238
internal class XamlRootObjectProvider : IRootObjectProvider
0 commit comments