X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FIOC%2FContainer.pm;h=a1ca69a3359b6f3b51a32455e6dc406b3c123273;hb=8697f11669be14108294ead3f14bbf4054fa7210;hp=cca21739a52c04d79af93cd3dbe977d47e6e9a2e;hpb=59221ae6ea96e14445c3b190f340b4532eabfe33;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/IOC/Container.pm b/lib/Catalyst/IOC/Container.pm index cca2173..a1ca69a 100644 --- a/lib/Catalyst/IOC/Container.pm +++ b/lib/Catalyst/IOC/Container.pm @@ -472,9 +472,6 @@ sub setup_components { unless $comps{$component}; } } - - $self->get_sub_container('model')->make_single_default; - $self->get_sub_container('view')->make_single_default; } sub _fix_syntax { @@ -603,25 +600,6 @@ sub find_component_regexp { return @result; } -# FIXME - t0m, how do you feel about this name? -# also, do you think I should draw it here, or just return the data structure? -sub get_components_names_types { - my ( $self ) = @_; - my @comps_names_types; - - for my $sub_container_name (qw/model view controller/) { - my $sub_container = $self->get_sub_container($sub_container_name); - for my $service ( $sub_container->get_service_list ) { - my $comp = $sub_container->resolve(service => $service); - my $compname = ref $comp || $comp; - my $type = ref $comp ? 'instance' : 'class'; - push @comps_names_types, [ $compname, $type ]; - } - } - - return @comps_names_types; -} - sub get_all_components { my $self = shift; my %components;