Changeset fe3540 for molecuilder/src/Actions/Action.cpp

Timestamp:

Mar 25, 2010, 12:01:58 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

eb129c

Parents:

db6b872 (diff), 8d9984 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

File:

• molecuilder/src/Actions/Action.cpp (modified) (3 diffs)

molecuilder/src/Actions/Action.cpp

@@ -10 +10 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/ActionHistory.hpp"
 
 using namespace std;
+
+// An empty state to indicate success
+Action::state_ptr Action::success = Action::state_ptr(new ActionState());
+Action::state_ptr Action::failure = Action::state_ptr(new ActionState());
 
 Action::Action(std::string _name,bool _doRegister) :
@@ -17 +22 @@
 {
   if(_doRegister){
-    ActionRegistry::getRegistry()->registerAction(this);
+    ActionRegistry::getInstance().registerAction(this);
   }
 }
@@ -27 +32 @@
   return name;
 }
+
+void Action::call(){
+  // forward to private virtual
+  state_ptr state = performCall();
+  if(shouldUndo() && state != failure){
+    if(canUndo()){
+      ActionHistory::getInstance().addElement(this,state);
+    }
+    else{
+      ActionHistory::getInstance().clear();
+    }
+  }
+}
+Action::state_ptr Action::undo(state_ptr _state) {
+  // forward to private virtual
+  return performUndo(_state);
+}
+Action::state_ptr Action::redo(state_ptr _state) {
+  // forward to private virtual
+  return performRedo(_state);
+}