Commit 2131d21a authored by Magali Ruffier's avatar Magali Ruffier
Browse files

removed 3 lines of commented out code

replaced reg with registry for more explicit code
parent 7cb1a222
...@@ -64,7 +64,7 @@ use Bio::EnsEMBL::Utils::Argument qw(rearrange); ...@@ -64,7 +64,7 @@ use Bio::EnsEMBL::Utils::Argument qw(rearrange);
use Bio::EnsEMBL::Registry; use Bio::EnsEMBL::Registry;
use Bio::EnsEMBL::Utils::ConfigRegistry; use Bio::EnsEMBL::Utils::ConfigRegistry;
my $reg = "Bio::EnsEMBL::Registry"; my $registry = "Bio::EnsEMBL::Registry";
=head2 new =head2 new
...@@ -147,10 +147,6 @@ sub new { ...@@ -147,10 +147,6 @@ sub new {
$self = Bio::EnsEMBL::Utils::ConfigRegistry::gen_load($self); $self = Bio::EnsEMBL::Utils::ConfigRegistry::gen_load($self);
# if(!defined($species) ){
# $reg->find_and_add_aliases($self);
# }
$self->species_id( $species_id || 1 ); $self->species_id( $species_id || 1 );
$self->is_multispecies( defined($is_multispecies) $self->is_multispecies( defined($is_multispecies)
...@@ -555,7 +551,7 @@ sub add_ExternalFeatureFactory{ ...@@ -555,7 +551,7 @@ sub add_ExternalFeatureFactory{
sub get_adaptor { sub get_adaptor {
my ($self, $canonical_name, @other_args) = @_; my ($self, $canonical_name, @other_args) = @_;
return $reg->get_adaptor($self->species(),$self->group(),$canonical_name); return $registry->get_adaptor($self->species(),$self->group(),$canonical_name);
} }
...@@ -580,7 +576,7 @@ sub get_adaptor { ...@@ -580,7 +576,7 @@ sub get_adaptor {
sub set_adaptor { sub set_adaptor {
my ($self, $canonical_name, $module) = @_; my ($self, $canonical_name, $module) = @_;
$reg->add_adaptor($self->species(),$self->group(),$canonical_name,$module); $registry->add_adaptor($self->species(),$self->group(),$canonical_name,$module);
return $module; return $module;
} }
...@@ -895,11 +891,11 @@ sub dnadb { ...@@ -895,11 +891,11 @@ sub dnadb {
if(@_) { if(@_) {
my $arg = shift; my $arg = shift;
$reg->add_DNAAdaptor($self->species(),$self->group(),$arg->species(),$arg->group()); $registry->add_DNAAdaptor($self->species(),$self->group(),$arg->species(),$arg->group());
} }
# return $self->{'dnadb'} || $self; # return $self->{'dnadb'} || $self;
return $reg->get_DNAAdaptor($self->species(),$self->group()) || $self; return $registry->get_DNAAdaptor($self->species(),$self->group()) || $self;
} }
...@@ -917,7 +913,7 @@ sub AUTOLOAD { ...@@ -917,7 +913,7 @@ sub AUTOLOAD {
throw( sprintf( "Could not work out type for %s\n", $AUTOLOAD ) ); throw( sprintf( "Could not work out type for %s\n", $AUTOLOAD ) );
} }
my $ret = $reg->get_adaptor( $self->species(), $self->group(), $type ); my $ret = $registry->get_adaptor( $self->species(), $self->group(), $type );
return $ret if $ret; return $ret if $ret;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment