Changes in src/Actions/ActionSequence.cpp [1fa107:5b0b98]

File:

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

src/Actions/ActionSequence.cpp

@@ -8 +8 @@
 #include "Actions/ActionSequence.hpp"
 #include "Actions/Action.hpp"
+
+#include "Helpers/Assert.hpp"
 
 using namespace std;
@@ -34 +36 @@
 }
 
-void ActionSequence::callAll(){
-  deque<Action*>::iterator it;
-  for(it=actions.begin(); it!=actions.end(); it++)
-    (*it)->call();
+ActionSequence::stateSet ActionSequence::callAll(){
+  stateSet states;
+  for(actionSet::iterator it=actions.begin(); it!=actions.end(); it++){
+    // we want to have a global bookkeeping for all actions in the sequence, so
+    // we bypass the normal call
+    Action::state_ptr state = (*it)->performCall();
+    states.push_back(state);
+  }
+  return states;
 }
 
-void ActionSequence::undoAll(){
-  deque<Action*>::reverse_iterator rit;
-  for(rit=actions.rbegin(); rit!=actions.rend(); rit++)
-    (*rit)->undo();
+ActionSequence::stateSet ActionSequence::undoAll(stateSet states){
+  ASSERT(canUndo(),"Trying to undo a sequence that contains methods that can't be undone");
+  stateSet res;
+  actionSet::reverse_iterator actionRit = actions.rbegin();
+  stateSet::reverse_iterator stateRit = states.rbegin();
+  for(;actionRit!=actions.rend();++actionRit,++stateRit){
+    ASSERT(stateRit!=states.rend(),"End of states prematurely reached.");
+    if((*actionRit)->shouldUndo()){
+      Action::state_ptr newState = (*actionRit)->performUndo(*stateRit);
+      // The order of the states has to correspond to the order of the actions
+      // this is why we have to add at the beginning
+      res.push_front(newState);
+    }
+    else{
+      res.push_front(Action::success);
+    }
+  }
+  return res;
+}
+
+ActionSequence::stateSet ActionSequence::redoAll(stateSet states){
+  stateSet res;
+  actionSet::iterator actionIt = actions.begin();
+  stateSet::iterator stateIt = states.begin();
+  for(;actionIt!=actions.end();++actionIt,++stateIt){
+    ASSERT(stateIt!=states.end(),"End of states prematurely reached.");
+    if((*actionIt)->shouldUndo()){
+      Action::state_ptr newState =(*actionIt)->performRedo(*stateIt);
+      res.push_back(newState);
+    }
+    else{
+      res.push_back(Action::success);
+    }
+  }
+  return res;
 }
 
 bool ActionSequence::canUndo(){
   bool canUndo=true;
-  deque<Action*>::iterator it;
-  for(it=actions.begin(); it!=actions.end(); it++)
-    canUndo &= (*it)->canUndo();
+  for(deque<Action*>::iterator it=actions.begin(); it!=actions.end(); ++it){
+    if((*it)->shouldUndo()){
+      canUndo &= (*it)->canUndo();
+    }
+  }
   return canUndo;
 }
+
+bool ActionSequence::shouldUndo(){
+  bool shouldUndo = false;
+  for(deque<Action*>::iterator it=actions.begin();it!=actions.end();++it){
+    shouldUndo |= (*it)->shouldUndo();
+  }
+  return shouldUndo;
+}