Changeset 3e8325 for molecuilder/src/Actions

Timestamp:

Jan 7, 2010, 2:46:34 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

d97af9

Parents:

34ff5e6

Message:

Added a central registry that allows access to actions by name.

Location:

molecuilder/src/Actions

Files:

• Action.cpp (modified) (1 diff)
• Action.hpp (modified) (3 diffs)
• ActionRegistry.cpp (added)
• ActionRegistry.hpp (added)
• ErrorAction.cpp (modified) (1 diff)
• ErrorAction.hpp (modified) (1 diff)
• MakroAction.cpp (modified) (1 diff)
• MakroAction.hpp (modified) (2 diffs)
• MethodAction.cpp (modified) (2 diffs)
• MethodAction.hpp (modified) (2 diffs)

molecuilder/src/Actions/Action.cpp

@@ -6 +6 @@
  */
 
-#include "Action.hpp"
+#include <string>
 
-Action::Action()
-{}
+#include "Actions/Action.hpp"
+#include "Actions/ActionRegistry.hpp"
+
+using namespace std;
+
+Action::Action(std::string _name,bool _doRegister) :
+name(_name)
+{
+  if(_doRegister){
+    ActionRegistry::getRegistry()->registerAction(this);
+  }
+}
 
 Action::~Action()
 {}
+
+const string Action::getName(){
+  return name;
+}

molecuilder/src/Actions/Action.hpp

@@ -8 +8 @@
 #ifndef ACTION_H_
 #define ACTION_H_
+
+#include <string>
 
 /**
@@ -21 +23 @@
 protected:
 public:
-  Action();
+  Action(std::string _name,bool _doRegister=true);
   virtual ~Action();
 
@@ -28 +30 @@
   virtual bool canUndo()=0;
 
+  virtual const std::string getName();
+
+private:
+  std::string name;
 };
 

molecuilder/src/Actions/ErrorAction.cpp

@@ -14 +14 @@
 using namespace std;
 
-ErrorAction::ErrorAction(const char * _errorMsg) :
+ErrorAction::ErrorAction(string _name,const char * _errorMsg,bool _doRegister) :
+Action(_name,_doRegister),
 errorMsg(_errorMsg)
 {

molecuilder/src/Actions/ErrorAction.hpp

@@ -15 +15 @@
 {
 public:
-  ErrorAction(const char *);
+  ErrorAction(std::string _name,const char * _errorMsg,bool _doRegister=true);
   virtual ~ErrorAction();
 

molecuilder/src/Actions/MakroAction.cpp

@@ -6 +6 @@
  */
 
+#include <string>
+
 #include "Actions/MakroAction.hpp"
 #include "Actions/Action.hpp"
 #include "Actions/ActionSequence.hpp"
 
-MakroAction::MakroAction(ActionSequence* _actions) :
+using namespace std;
+
+MakroAction::MakroAction(string _name,ActionSequence* _actions,bool _doRegister) :
+Action(_name,_doRegister),
 actions(_actions)
 {

molecuilder/src/Actions/MakroAction.hpp

@@ -8 +8 @@
 #ifndef MAKROACTION_HPP_
 #define MAKROACTION_HPP_
+
+#include <string>
 
 #include "Actions/Action.hpp"
@@ -21 +23 @@
 {
 public:
-  MakroAction(ActionSequence*);
+  MakroAction(std::string _name,ActionSequence* _actions,bool _doRegister=true);
   virtual ~MakroAction();
 

molecuilder/src/Actions/MethodAction.cpp

@@ -8 +8 @@
 #include <iostream>
 #include <boost/function.hpp>
+#include <string>
 
 #include "MethodAction.hpp"
@@ -13 +14 @@
 using namespace std;
 
-MethodAction::MethodAction(boost::function<void()> _executeMethod) :
+MethodAction::MethodAction(string _name,boost::function<void()> _executeMethod,bool _doRegister) :
+   Action(_name,_doRegister),
 executeMethod(_executeMethod)
 {

molecuilder/src/Actions/MethodAction.hpp

@@ -10 +10 @@
 
 #include <boost/function.hpp>
+#include <string>
 
 #include "Actions/Action.hpp"
@@ -19 +20 @@
 {
 public:
-  MethodAction(boost::function<void()>);
+  MethodAction(std::string _name,boost::function<void()> _executeMethod,bool _doRegister=true);
   virtual ~MethodAction();