Changes in src/Actions/Action.cpp [bcf653:e4afb4]

File:

• src/Actions/Action.cpp (modified) (5 diffs)

src/Actions/Action.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
+#include <iostream>
 #include <string>
 
@@ -25 +26 @@
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/ActionHistory.hpp"
+#include "Actions/OptionRegistry.hpp"
+#include "Actions/OptionTrait.hpp"
 #include "Exceptions/MissingValueException.hpp"
 #include "UIElements/Dialog.hpp"
+#include "Helpers/Assert.hpp"
 #include "Helpers/MemDebug.hpp"
 #include "UIElements/UIFactory.hpp"
@@ -43 +47 @@
 Action::state_ptr Action::failure = getEmptyState();
 
-Action::Action(std::string _name,bool _doRegister) :
-name(_name)
+Action::Action(const ActionTraits &_Traits, bool _doRegister) :
+    Traits(_Traits)
 {
+  // register with ActionRegistry
   if(_doRegister){
     ActionRegistry::getInstance().registerInstance(this);
+  }
+
+  // register with OptionRegistry
+  for (ActionTraits::options_const_iterator optioniter = Traits.getBeginIter();
+      optioniter != Traits.getEndIter();
+      ++optioniter) {
+    // options may have been re-used by other Actions, so check beforehand whether adding is needed
+    if (!OptionRegistry::getInstance().isOptionPresentByName((optioniter->first))) {
+      OptionRegistry::getInstance().registerInstance(optioniter->second);
+    } else { // if present, ASSERT that types coincide
+      OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
+      ASSERT(PresentOption->getType() == optioniter->second->getType(),
+          ("Action::Action() - option to add "+
+              std::string(optioniter->first)+
+              " of Action "+
+              std::string(getName())+
+              " is already present with different type!"
+          )
+      );
+    }
   }
 }
@@ -55 +80 @@
 
 const string Action::getName(){
-  return name;
+  return Traits.getName();
 }
 
@@ -104 +129 @@
   return true;
 }
+