Changes in / [2ad482:69baa4]

Location:

src

Files:

• Actions/Action.cpp (modified) (1 diff)
• Actions/ActionRegistry.cpp (modified) (2 diffs)
• Actions/ActionRegistry.hpp (modified) (2 diffs)
• Descriptors/MoleculeNameDescriptor.cpp (modified) (1 diff)
• Descriptors/MoleculePtrDescriptor.cpp (modified) (1 diff)
• Patterns/ObservedContainer_impl.hpp (modified) (2 diffs)
• Patterns/Registry.hpp (deleted)
• Patterns/Registry_impl.hpp (deleted)
• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -34 +34 @@
 {
   if(_doRegister){
-    ActionRegistry::getInstance().registerInstance(this);
+    ActionRegistry::getInstance().registerAction(this);
   }
 }

src/Actions/ActionRegistry.cpp

@@ -1 +1 @@
 /*
- * Registry<Action>.cpp
+ * ActionRegistry.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 <string>
+#include "Helpers/Assert.hpp"
+#include <iostream>
+
+using namespace std;
 
 /** Constructor for class ActionRegistry.
  */
 ActionRegistry::ActionRegistry()
-{}
+{
+}
 
 /** Destructor for class ActionRegistry.
  */
 ActionRegistry::~ActionRegistry()
-{}
+{
+  map<const string,Action*>::iterator iter;
+  for(iter=actionMap.begin();iter!=actionMap.end();++iter) {
+    delete iter->second;
+  }
+  actionMap.clear();
+}
 
-/** Just passes on call to Registry<Action>::getByName().
- * \param name name of Action
+/** Returns pointer to an action named by \a name.
+ * \param name name of action
  * \return pointer to Action
  */
-Action* ActionRegistry::getActionByName(const std::string name)
-{
-  return getByName(name);
+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;
 }
 
-/** Just passes on call to Registry<Action>::isPresentByName().
- * \param name name of Action
- * \return true - Action instance present, false - not
+/** States whether action is present or not.
+ * \note This iss needed as ActionRegistry::getActionByName() ASSERT()s that action is in map.
+ * \param name name of action
+ * \return true - Action present, false - Action absent
  */
-bool ActionRegistry::isActionPresentByName(const std::string name)
-{
-  return isPresentByName(name);
+bool ActionRegistry::isActionByNamePresent(const std::string name){
+  map<const string,Action*>::iterator iter;
+  iter = actionMap.find(name);
+  return iter!=actionMap.end();
 }
 
+/** Registers an Action with the ActionRegistry.
+ * \param *action pointer to Action.
+ */
+void ActionRegistry::registerAction(Action* action){
+  pair<map<const string,Action*>::iterator,bool> ret;
+  //cout << "Trying to register action with name " << action->getName() << "." << endl;
+  ret = actionMap.insert(pair<const string,Action*>(action->getName(),action));
+  ASSERT(ret.second,"Two actions with the same name added to registry");
+}
+
+/** Unregisters an Action.
+ * \param *action pointer to Action.
+ */
+void ActionRegistry::unregisterAction(Action* action){
+  //cout << "Unregistering action with name " << action->getName() << "." << endl;
+  actionMap.erase(action->getName());
+}
+
+/** Returns an iterator pointing to the start of the map of Action's.
+ * \return begin iterator
+ */
+std::map<const std::string,Action*>::iterator ActionRegistry::getBeginIter()
+{
+  return actionMap.begin();
+}
+
+/** Returns an iterator pointing to the end of the map of Action's.
+ * \return end iterator
+ */
+std::map<const std::string,Action*>::iterator ActionRegistry::getEndIter()
+{
+  return actionMap.end();
+}
+
+/** Returns a const iterator pointing to the start of the map of Action's.
+ * \return constant begin iterator
+ */
+std::map<const std::string,Action*>::const_iterator ActionRegistry::getBeginIter() const
+{
+  return actionMap.begin();
+}
+
+/** Returns a const iterator pointing to the end of the map of Action's.
+ * \return constant end iterator
+ */
+std::map<const std::string,Action*>::const_iterator ActionRegistry::getEndIter() const
+{
+  return actionMap.end();
+}
+
+/** Prints the contents of the ActionRegistry \a &m to \a &ost.
+ * \param &ost output stream
+ * \param &m reference to ActionRegistry
+ * \return reference to the above out stream for concatenation
+ */
+ostream& operator<<(ostream& ost, const ActionRegistry& m)
+{
+  ost << "ActionRegistry contains:" << endl;
+  for (std::map<const std::string,Action*>::const_iterator iter = m.getBeginIter(); iter != m.getEndIter(); ++iter) {
+    ost << "\t" << iter->first << " with pointer " << iter->second << endl;
+  }
+  return ost;
+};
+
+
+
 CONSTRUCT_SINGLETON(ActionRegistry)
-CONSTRUCT_REGISTRY(Action)

src/Actions/ActionRegistry.hpp

@@ -1 +1 @@
 /*
- * Registry<Action>.hpp
+ * ActionRegistry.hpp
  *
  *  Created on: Jan 7, 2010
@@ -13 +13 @@
 #include <map>
 
-#include "Patterns/Registry.hpp"
 #include "Patterns/Singleton.hpp"
-#include "Actions/Action.hpp"
 
-/** Action Registry.
- *
- * The Action registry is a storage for any Action instance to retrieved by name.
- * It is a singleton and can be called from anywhere.
- *
- */
-class ActionRegistry : public Singleton<ActionRegistry>, public Registry<Action>
+class Action;
+
+class ActionRegistry : public Singleton<ActionRegistry>
 {
   friend class Singleton<ActionRegistry>;
-  //friend class Registry<Action>;
+public:
+  Action* getActionByName(const std::string);
+  bool isActionByNamePresent(const std::string name);
+  void registerAction(Action*);
+  void unregisterAction(Action*);
 
-public:
-  Action* getActionByName(const std::string name);
-  bool isActionPresentByName(const std::string name);
+  std::map<const std::string,Action*>::iterator getBeginIter();
+  std::map<const std::string,Action*>::const_iterator getBeginIter() const;
+  std::map<const std::string,Action*>::iterator getEndIter();
+  std::map<const std::string,Action*>::const_iterator getEndIter() const;
+
+private:
+  std::map<const std::string,Action*> actionMap;
 
 private:
   ActionRegistry();
-  ~ActionRegistry();
+  virtual ~ActionRegistry();
 };
 
+std::ostream& operator<<(std::ostream& ost, const ActionRegistry& m);
+
 #endif /* ACTIONREGISTRY_HPP_ */

src/Descriptors/MoleculeNameDescriptor.cpp

@@ -30 +30 @@
 
 molecule *MoleculeNameDescriptor_impl::find(){
-  World::MoleculeSet &molecules = getMolecules();
+  World::MoleculeSet molecules = getMolecules();
   World::MoleculeSet::iterator res = molecules.begin();
   for (; res != molecules.end(); res++)

src/Descriptors/MoleculePtrDescriptor.cpp

@@ -34 +34 @@
 
 molecule *MoleculePtrDescriptor_impl::find(){
-  World::MoleculeSet &molecules = getMolecules();
+  World::MoleculeSet molecules = getMolecules();
   World::MoleculeSet::iterator res = molecules.find(ptr->getId());
   return (res!=molecules.end())?((*res).second):0;

src/Patterns/ObservedContainer_impl.hpp

@@ -17 +17 @@
 
 template <class Container>
-inline ObservedContainer<Container>::ObservedContainer(const ObservedContainer<Container> &src) :
+inline ObservedContainer<Container>::ObservedContainer(const ObservedContainer &src) :
   content(src.content),
   obs(src.obs)
@@ -29 +29 @@
 inline
 ObservedContainer<Container>&
-ObservedContainer<Container>::operator=(const ObservedContainer<Container> &rhs){
+ObservedContainer<Container>::operator=(const ObservedContainer &rhs){
   content=rhs.content;
   return *this;

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -44 +44 @@
   for (std::list<std::string>::iterator CommandRunner = CommandLineParser::getInstance().SequenceOfActions.begin(); CommandRunner != CommandLineParser::getInstance().SequenceOfActions.end(); ++CommandRunner) {
     cout << "Checking presence of " << *CommandRunner << ": ";
-    if (ActionRegistry::getInstance().isActionPresentByName(*CommandRunner)) {
+    if (ActionRegistry::getInstance().isActionByNamePresent(*CommandRunner)) {
       cout << "calling " << *CommandRunner << endl;
       ActionRegistry::getInstance().getActionByName(*CommandRunner)->call();