Changeset dfed1c for src/base/factory.cpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/factory.cpp (modified) (2 diffs)

src/base/factory.cpp

@@ -33 +33 @@
 Factory::~Factory()
 {
-  Destroy();
-
-  for (Factory::command_iterator iter=command_map.begin(); iter!=command_map.end(); ++iter)
+  for (std::map<std::string, Object*>::iterator iter=object_map.begin(); iter!=object_map.end(); ++iter)
     delete iter->second;
-
-  command_map.clear();
 }
 
-void Factory::Destroy()
+void Factory::Register(Object* object)
 {
-  for (Factory::instance_iterator iter=command_instance_map.begin(); iter!=command_instance_map.end(); ++iter)
-    delete iter->second;
-
-  for (Factory::object_iterator iter=object_map.begin(); iter!=object_map.end(); ++iter)
-    delete iter->second;
-
-  command_instance_map.clear();
-  object_map.clear();
+  Delete(object->Name());
+  object_map.insert(std::make_pair(object->Name(), object));
 }
 
-void Factory::RegisterCommand(CommandProxyBase* object)
+Object* Factory::Get(std::string id)
 {
-  if (command_map.find(object->Name()) == command_map.end())
-    command_map.insert(std::pair<std::string, CommandProxyBase*>(object->Name(), object));
-  else
-    assert(0 == "A command with the same unique name has already been registered.");
-}
+  std::map<std::string, Object*>::iterator iter = object_map.find(id);
 
-void Factory::RegisterObject(Object* object)
-{
-  Factory::object_iterator iter = object_map.find(object->Name());
+  if (iter != object_map.end())
+    return iter->second;
 
-  if (iter != object_map.end()) {
-    delete iter->second;
-    object_map.erase(iter);
-  }
-
-  object_map.insert(std::pair<std::string, Object*>(object->Name(), object));
-}
-
-Command* Factory::GetCommand(std::string id)
-{
-  MG::Instance();
-#ifdef DEBUG
-  //std::cout << id << std::endl;
-#endif
-
-  Factory::instance_iterator iter1 = command_instance_map.find(id);
-  if (iter1 != command_instance_map.end())
-    return iter1->second;
-
-  Factory::command_iterator iter2 = command_map.find(id);
-  if (iter2 != command_map.end()) {
-    Command *command = iter2->second->CreateCommand();
-    command_instance_map.insert(std::pair<std::string, Command*>(id, command));
-    return command;
-  }
-
-  assert(0 == "This command is not registered.");
+  MG::GetComm()->PrintStringOnce("Error: Object %s is not registered", id.c_str());
+  assert(0);
 
   return NULL;
 }
 
-bool Factory::CheckNumberOfArguments(std::string id, const int& num_arguments)
+void Factory::Delete(std::string id)
 {
-  Factory::command_iterator iter = command_map.find(id);
-
-  assert(iter != command_map.end());
-  assert(iter->second->Arguments() == num_arguments);
-
-  return iter->second->Arguments() == num_arguments;
-}
-
-Object* Factory::GetObject(std::string id)
-{
-  MG::Instance();
-
-  Factory::object_iterator iter = object_map.find(id);
-  if (iter != object_map.end())
-    return iter->second;
-
-  assert(0 == "This object is not registered.");
-
-  return NULL;
-}
-
-void Factory::DeleteCommand(std::string id)
-{
-  Factory::command_iterator iter1 = command_map.find(id);
-
-  if (iter1 != command_map.end()) {
-    delete iter1->second;
-    command_map.erase(iter1);
-  }
-
-  Factory::instance_iterator iter2 = command_instance_map.find(id);
-
-  if (iter2 != command_instance_map.end()) {
-    delete iter2->second;
-    command_instance_map.erase(iter2);
-  }
-}
-
-void Factory::DeleteObject(std::string id)
-{
-  Factory::object_iterator iter = object_map.find(id);
+  std::map<std::string, Object*>::iterator iter = object_map.find(id);
 
   if (iter != object_map.end()) {
@@ -146 +66 @@
 }
 
-void Factory::PrintAvailableCommands()
-{
-  for (Factory::command_iterator iter=command_map.begin(); iter!=command_map.end(); ++iter)
-    printf("%s\n", iter->second->Name());
-}
-
 void Factory::PrintAvailableObjects()
 {
-  for (Factory::object_iterator iter=object_map.begin(); iter!=object_map.end(); ++iter)
-    printf("%s\n", iter->second->Name().c_str());
+  MG::GetComm()->PrintStringOnce("Registered objects:");
+  for (std::map<std::string, Object*>::iterator iter=object_map.begin(); iter!=object_map.end(); ++iter)
+    MG::GetComm()->PrintStringOnce("%s", iter->second->Name().c_str());
 }