Mercurial > pub > Impl
diff Lib/IMPL/DOM/Schema.pm @ 389:5aff94ba842f
DOM Schema refactoring complete
author | cin |
---|---|
date | Wed, 12 Feb 2014 13:36:24 +0400 |
parents | 2f16f13b000c |
children | f23fcb19d3c1 |
line wrap: on
line diff
--- a/Lib/IMPL/DOM/Schema.pm Tue Feb 11 20:22:01 2014 +0400 +++ b/Lib/IMPL/DOM/Schema.pm Wed Feb 12 13:36:24 2014 +0400 @@ -19,7 +19,6 @@ Validator => 'IMPL::DOM::Schema::Validator', Builder => 'IMPL::DOM::Navigator::Builder', XMLReader => 'IMPL::DOM::XMLReader', # XMLReader references Schema - InflateFactory => 'IMPL::DOM::Schema::InflateFactory', Loader => 'IMPL::Code::Loader', StringMap => 'IMPL::Resources::StringLocaleMap' }, @@ -61,7 +60,7 @@ return $type if $type; foreach my $base ($this->baseSchemas) { - last if $type = $base->resolveType($typeName); + last if $type = $base->ResolveType($typeName); } die IMPL::KeyNotFoundException->new($typeName) @@ -242,16 +241,14 @@ Node->new(name => 'Property', type=>'Property', maxOccur=>'unbounded', minOccur=>0), AnyNode->new(maxOccur => 'unbounded', minOccur => 0, type=>'Validator') ), - Property->new(name => 'type'), - Property->new(name => 'inflator', optional => 1, inflator => 'IMPL::DOM::Schema::InflateFactory') + Property->new(name => 'type') ), ComplexType->new(type => 'SimpleNode', nativeType => 'IMPL::DOM::Schema::SimpleNode')->appendRange( NodeList->new()->appendRange( Node->new(name => 'Property', type=>'Property', maxOccur=>'unbounded', minOccur=>0), AnyNode->new(maxOccur => 'unbounded', minOccur => 0, type=>'Validator') ), - Property->new(name => 'name'), - Property->new(name => 'inflator', optional => 1, inflator => 'IMPL::DOM::Schema::InflateFactory') + Property->new(name => 'name') ), ComplexType->new(type => 'Validator', nativeType => 'IMPL::DOM::Schema::Validator')->appendRange( NodeList->new()->appendRange( @@ -262,8 +259,7 @@ NodeList->new()->appendRange( AnyNode->new(maxOccur => 'unbounded', minOccur => 0) ), - Property->new(name => 'name'), - Property->new(name => 'inflator', optional => 1, inflator => 'IMPL::DOM::Schema::InflateFactory') + Property->new(name => 'name') ), SimpleType->new(type => 'Node', nativeType => 'IMPL::DOM::Schema::Node')->appendRange( Property->new(name => 'name'),