Changes in src/Actions/ActionQueue.cpp [29b52b:11d433]

File:

• src/Actions/ActionQueue.cpp (modified) (8 diffs)

src/Actions/ActionQueue.cpp

@@ -55 +55 @@
 using namespace MoleCuilder;
 
-const Action* ActionQueue::_lastchangedaction = NULL;
-
 ActionQueue::ActionQueue() :
-    Observable("ActionQueue"),
     AR(new ActionRegistry()),
     history(new ActionHistory),
@@ -69 +66 @@
     run_thread_isIdle(true)
 #endif
-{
-  // channels of observable
-  Channels *OurChannel = new Channels;
-  NotificationChannels.insert( std::make_pair(static_cast<Observable *>(this), OurChannel) );
-  // add instance for each notification type
-  for (size_t type = 0; type < NotificationType_MAX; ++type)
-    OurChannel->addChannel(type);
-}
+{}
 
 ActionQueue::~ActionQueue()
@@ -84 +74 @@
 #endif
 
-  // free all actions contained in actionqueue
-  for (ActionQueue_t::iterator iter = actionqueue.begin(); !actionqueue.empty(); iter = actionqueue.begin()) {
-    delete *iter;
-    actionqueue.erase(iter);
-  }
+  clearQueue();
 
   delete history;
@@ -96 +82 @@
 void ActionQueue::queueAction(const std::string &name, enum Action::QueryOptions state)
 {
-  queueAction(AR->getActionByName(name), state);
-}
-
-void ActionQueue::queueAction(Action *_action, enum Action::QueryOptions state)
-{
-  OBSERVE;
-  NOTIFY(ActionQueued);
+  const Action * const registryaction = AR->getActionByName(name);
+  queueAction(registryaction, state);
+}
+
+void ActionQueue::queueAction(const Action * const _action, enum Action::QueryOptions state)
+{
   Action *newaction = _action->clone(state);
   newaction->prepare(state);
@@ -116 +101 @@
     std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
     World::getInstance().setExitFlag(5);
-    actionqueue.clear();
-    tempqueue.clear();
+    clearQueue();
+    lastActionOk = false;
+    std::cerr << "ActionQueue cleared." << std::endl;
+  } catch (std::exception &e) {
+    pushStatus("FAIL: General exception caught, aborting.");
+    World::getInstance().setExitFlag(134);
+    clearQueue();
     lastActionOk = false;
     std::cerr << "ActionQueue cleared." << std::endl;
@@ -128 +118 @@
   mtx_queue.unlock();
 #endif
-  _lastchangedaction = newaction;
 }
 
@@ -180 +169 @@
         pushStatus("FAIL: Action "+*boost::get_error_info<ActionNameString>(e)+" has failed.");
         World::getInstance().setExitFlag(5);
-        actionqueue.clear();
-        tempqueue.clear();
+        clearQueue();
         lastActionOk = false;
+        std::cerr << "ActionQueue cleared." << std::endl;
+        CurrentAction = (size_t)-1;
+      } catch (std::exception &e) {
+        pushStatus("FAIL: General exception caught, aborting.");
+        World::getInstance().setExitFlag(134);
+        clearQueue();
         std::cerr << "ActionQueue cleared." << std::endl;
         CurrentAction = (size_t)-1;
@@ -302 +296 @@
 }
 
+void ActionQueue::clearQueue()
+{
+  // free all actions contained in actionqueue
+  for (ActionQueue_t::iterator iter = actionqueue.begin();
+      !actionqueue.empty(); iter = actionqueue.begin()) {
+    delete *iter;
+    actionqueue.erase(iter);
+  }
+  // free all actions contained in tempqueue
+  for (ActionQueue_t::iterator iter = tempqueue.begin();
+      !tempqueue.empty(); iter = tempqueue.begin()) {
+    delete *iter;
+    tempqueue.erase(iter);
+  }
+}
 
 const ActionQueue::ActionTokens_t ActionQueue::getListOfActions() const