re #7403 changed all usages

mantidproject · Jul 17, 2013 · 0872787 · 0872787
1 parent 80148f6
commit 0872787
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/Code/Mantid/Framework/Kernel/src/ConfigService.cpp b/Code/Mantid/Framework/Kernel/src/ConfigService.cpp
@@ -1589,12 +1589,6 @@ const std::vector<std::string> ConfigServiceImpl::getFacilityNames()const
   return names;
 }
 
-/** Get the default facility
- * @return the facility information object
- */
-const FacilityInfo& ConfigServiceImpl::getFacility() const
-{
-
 /** Get the default facility
  * @return the facility information object
  */
@@ -1605,7 +1599,7 @@ const FacilityInfo& ConfigServiceImpl::getFacility() const
   {
     defFacility = "ISIS";
   }
-  return getFacility(defFacility);
+  return this->getFacility(defFacility);
 }
 
 /**

diff --git a/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp b/Code/Mantid/Framework/Kernel/src/MultiFileNameParser.cpp
@@ -198,19 +198,11 @@ namespace Kernel
       m_validInstNames()
     {
       ConfigServiceImpl & config = ConfigService::Instance();
-      FacilityInfo facility = config.getFacility();
-      std::string supportedFacilities = config.getString("supported.facilities");
 
-      std::vector<std::string> allFacilityNames;
-      boost::split(
-        allFacilityNames,
-        supportedFacilities,
-        boost::is_any_of(";"));
-
-      for( auto facilityName = allFacilityNames.begin(); facilityName != allFacilityNames.end(); ++facilityName )
+      auto facilities = config.getFacilities();
+      for( auto itFacility = facilities.begin(); itFacility != facilities.end(); ++itFacility )
       {
-        const FacilityInfo & facility = config.getFacility(*facilityName);
-        const std::vector<InstrumentInfo> instruments = facility.instruments();
+        const std::vector<InstrumentInfo> instruments = (**itFacility).instruments();
 
         for( auto instrument = instruments.begin(); instrument != instruments.end(); ++instrument )
         {

diff --git a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h
@@ -124,9 +124,9 @@ class ConfigServiceTest : public CxxTest::TestSuite
 
     TS_ASSERT_LESS_THAN(0,names.size());
     TS_ASSERT_EQUALS(facilities.size(),names.size());
-    auto itFacilities = m_facilities.begin();
+    auto itFacilities = facilities.begin();
     auto itNames = names.begin();
-    for (; itFacilities != m_facilities.end(); ++itFacilities,++itNames)
+    for (; itFacilities != facilities.end(); ++itFacilities,++itNames)
     {
       TS_ASSERT_EQUALS(*itNames, (**itFacilities).name());
     }

diff --git a/Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h b/Code/Mantid/Framework/Kernel/test/MultiFileNameParserTest.h
@@ -363,7 +363,6 @@ class MultiFileNameParserTest : public CxxTest::TestSuite
 
   void test_instrument_with_multiple_padding()
   {
-    Mantid::Kernel::ConfigService::Instance().setString("supported.facilities", "TEST");
 
     Parser parser;
     parser.parse("TESTHISTOLISTENER123,299-301");

diff --git a/Code/Mantid/MantidPlot/src/ConfigDialog.cpp b/Code/Mantid/MantidPlot/src/ConfigDialog.cpp
@@ -677,13 +677,15 @@ void ConfigDialog::initMantidPage()
 
   // Populate boxes
   Mantid::Kernel::ConfigServiceImpl & mantid_config = Mantid::Kernel::ConfigService::Instance();
-  QString property = QString::fromStdString(mantid_config.getString("supported.facilities"));
 
-  QStringList prop_list = property.split(";", QString::SkipEmptyParts);
-  facility->addItems(prop_list);
+  auto faclist = mantid_config.getFacilityNames();
+  for ( auto it = faclist.begin(); it != faclist.end(); ++it )
+  {
+    facility->addItem(QString::fromStdString(*it));
+  }
 
   // Set default property
-  property = QString::fromStdString(mantid_config.getFacility().name());
+  QString property = QString::fromStdString(mantid_config.getFacility().name());
   int index = facility->findText(property);
   if( index < 0 )
   {

diff --git a/Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.cpp b/Code/Mantid/MantidPlot/src/Mantid/FirstTimeSetup.cpp
@@ -21,10 +21,10 @@ void FirstTimeSetup::initLayout()
 
   // Populate list of facilities
   m_uiForm.cbFacility->clear();
-  QStringList faclist = QString::fromStdString(Mantid::Kernel::ConfigService::Instance().getString("supported.facilities")).split(";");
-  for ( QStringList::iterator it = faclist.begin(); it != faclist.end(); ++it )
+  auto faclist = Mantid::Kernel::ConfigService::Instance().getFacilityNames();
+  for ( auto it = faclist.begin(); it != faclist.end(); ++it )
   {
-    m_uiForm.cbFacility->addItem(*it);
+    m_uiForm.cbFacility->addItem(QString::fromStdString(*it));
   }
 }