added in Affy adaptors and made it easier to add "standard named" adaptors

modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm

@@ -261,48 +261,26 @@ sub get_db_adaptor {
 
 
 sub get_available_adaptors{
-
-  my %pairs =  ( 'Analysis'             => 'Bio::EnsEMBL::DBSQL::AnalysisAdaptor',
-		 'ArchiveStableId'      => 'Bio::EnsEMBL::DBSQL::ArchiveStableIdAdaptor',
-		 'Attribute'            => 'Bio::EnsEMBL::DBSQL::AttributeAdaptor',
-		 'AssemblyExceptionFeature' => 'Bio::EnsEMBL::DBSQL::AssemblyExceptionFeatureAdaptor',
-		 'AssemblyMapper'       => 'Bio::EnsEMBL::DBSQL::AssemblyMapperAdaptor',
-		 'Blast'                => 'Bio::EnsEMBL::External::BlastAdaptor',
-		 'MetaContainer'        => 'Bio::EnsEMBL::DBSQL::MetaContainer',
-		 'CoordSystem'   => 'Bio::EnsEMBL::DBSQL::CoordSystemAdaptor',
-		 'CompressedSequence' => 'Bio::EnsEMBL::DBSQL::CompressedSequenceAdaptor',
-		 'DBEntry'              => 'Bio::EnsEMBL::DBSQL::DBEntryAdaptor',
-		 'DnaAlignFeature'      => 'Bio::EnsEMBL::DBSQL::DnaAlignFeatureAdaptor',
-		 'DensityFeature'       => 'Bio::EnsEMBL::DBSQL::DensityFeatureAdaptor',
-		 'DensityType'          => 'Bio::EnsEMBL::DBSQL::DensityTypeAdaptor',
-		 'Exon'                 => 'Bio::EnsEMBL::DBSQL::ExonAdaptor',
-		 'Gene'                 => 'Bio::EnsEMBL::DBSQL::GeneAdaptor',
-		 'KaryotypeBand'        => 'Bio::EnsEMBL::DBSQL::KaryotypeBandAdaptor',
-		 'Marker'               => 'Bio::EnsEMBL::Map::DBSQL::MarkerAdaptor',
-		 'MarkerFeature'        =>
-		 'Bio::EnsEMBL::Map::DBSQL::MarkerFeatureAdaptor',
-		 'MetaCoordContainer'   => 'Bio::EnsEMBL::DBSQL::MetaCoordContainer',
-		 'MiscSet'              => 'Bio::EnsEMBL::DBSQL::MiscSetAdaptor',
-		 'MiscFeature'          => 'Bio::EnsEMBL::DBSQL::MiscFeatureAdaptor',
-		 'PredictionTranscript' => 'Bio::EnsEMBL::DBSQL::PredictionTranscriptAdaptor',
-		 'PredictionExon'       => 'Bio::EnsEMBL::DBSQL::PredictionExonAdaptor',
-		 'ProteinFeature'       => 'Bio::EnsEMBL::DBSQL::ProteinFeatureAdaptor',
-		 'ProteinAlignFeature'  =>
-		 'Bio::EnsEMBL::DBSQL::ProteinAlignFeatureAdaptor',
-		 'SNP'                  => 'Bio::EnsEMBL::DBSQL::ProxySNPAdaptor',
-		 'QtlFeature'           => 'Bio::EnsEMBL::Map::DBSQL::QtlFeatureAdaptor',
-		 'Qtl'                  => 'Bio::EnsEMBL::Map::DBSQL::QtlAdaptor',
-		 'RepeatConsensus'      => 'Bio::EnsEMBL::DBSQL::RepeatConsensusAdaptor',
-		 'RepeatFeature'        => 'Bio::EnsEMBL::DBSQL::RepeatFeatureAdaptor',
-		 'Sequence'             => 'Bio::EnsEMBL::DBSQL::SequenceAdaptor',
-		 'SimpleFeature'        => 'Bio::EnsEMBL::DBSQL::SimpleFeatureAdaptor',
-		 'Slice'                => 'Bio::EnsEMBL::DBSQL::SliceAdaptor',
-		 'SupportingFeature'    => 'Bio::EnsEMBL::DBSQL::SupportingFeatureAdaptor',
-		 'Transcript'           => 'Bio::EnsEMBL::DBSQL::TranscriptAdaptor',
-		 'Translation'          => 'Bio::EnsEMBL::DBSQL::TranslationAdaptor',
-);
-
-
+  my %pairs =  ( 
+   # Firstly those that just have an adaptor named after there object in the main DBSQL directory
+    map( { $_ => "Bio::EnsEMBL::DBSQL::${_}Adaptor" } qw( 
+      AffyFeature AffyArray AffyProbe Analysis ArchiveStableId
+      Attribute AssemblyExceptionFeature AssemblyMapper 
+      CoordSystem CompressedSequence DBEntry DnaAlignFeature DensityFeature DensityType 
+      Exon Gene KaryotypeBand MiscSet MiscFeature PredictionTranscript PredictionExon 
+      ProteinFeature ProteinAlignFeature RepeatConsensus RepeatFeature Sequence SimpleFeature
+      Slice SupportingFeature Transcript Translation
+    ) ),
+   # Those whose adaptors are in Map::DBSQL
+    map( { $_ => "Bio::EnsEMBL::Map::DBSQL::${_}Adaptor" } qw(
+      Marker MarkerFeature QtlFeature Qtl
+    ) ),
+   # Finally the exceptions... those that have non-standard names....
+    'Blast'                => 'Bio::EnsEMBL::External::BlastAdaptor',
+    'MetaCoordContainer'   => 'Bio::EnsEMBL::DBSQL::MetaCoordContainer',
+    'MetaContainer'        => 'Bio::EnsEMBL::DBSQL::MetaContainer',
+    'SNP'                  => 'Bio::EnsEMBL::DBSQL::ProxySNPAdaptor'
+  );
   return (\%pairs);
 }