Changes in src/Actions/ActionRegistry.cpp [112b09:b2d8d0]

File:

• src/Actions/ActionRegistry.cpp (modified) (2 diffs)

src/Actions/ActionRegistry.cpp

@@ -1 +1 @@
 /*
- * ActionRegistry.cpp
+ * Registry<Action>.cpp
  *
  *  Created on: Jan 7, 2010
@@ -9 +9 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/Action.hpp"
+#include "Patterns/Singleton_impl.hpp"
+#include "Patterns/Registry_impl.hpp"
 
-#include "Patterns/Singleton_impl.hpp"
+/** Constructor for class ActionRegistry.
+ */
+ActionRegistry::ActionRegistry()
+{}
 
-#include <string>
-#include "Helpers/Assert.hpp"
-#include <iostream>
+/** Destructor for class ActionRegistry.
+ */
+ActionRegistry::~ActionRegistry()
+{}
 
-using namespace std;
-
-ActionRegistry::ActionRegistry()
+/** Just passes on call to Registry<Action>::getByName().
+ * \param name name of Action
+ * \return pointer to Action
+ */
+Action* ActionRegistry::getActionByName(const std::string name)
 {
+  return getByName(name);
 }
 
-ActionRegistry::~ActionRegistry()
+/** Just passes on call to Registry<Action>::isPresentByName().
+ * \param name name of Action
+ * \return true - Action instance present, false - not
+ */
+bool ActionRegistry::isActionPresentByName(const std::string name)
 {
-  map<const string,Action*>::iterator iter;
-  for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
-    delete iter->second;
-  }
-  actionMap.clear();
-}
-
-Action* ActionRegistry::getActionByName(const std::string name){
-  map<const string,Action*>::iterator iter;
-  iter = actionMap.find(name);
-  ASSERT(iter!=actionMap.end(),"Query for an action not stored in registry");
-  return iter->second;
-}
-
-void ActionRegistry::registerAction(Action* action){
-  pair<map<const string,Action*>::iterator,bool> ret;
-  ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
-  ASSERT(ret.second,"Two actions with the same name added to registry");
-}
-
-void ActionRegistry::unregisterAction(Action* action){
-  actionMap.erase(action->getName());
-}
-
-std::map<const std::string,Action*>::iterator ActionRegistry::getBeginIter()
-{
-  return actionMap.begin();
-}
-
-std::map<const std::string,Action*>::iterator ActionRegistry::getEndIter()
-{
-  return actionMap.end();
+  return isPresentByName(name);
 }
 
 CONSTRUCT_SINGLETON(ActionRegistry)
+CONSTRUCT_REGISTRY(Action)