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

File:

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

src/Actions/Action.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
-#include <iostream>
 #include <string>
 
@@ -26 +25 @@
 #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"
@@ -47 +43 @@
 Action::state_ptr Action::failure = getEmptyState();
 
-Action::Action(const ActionTraits &_Traits, bool _doRegister) :
-    Traits(_Traits)
+Action::Action(std::string _name,bool _doRegister) :
+name(_name)
 {
-  // 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!"
-          )
-      );
-    }
   }
 }
@@ -80 +55 @@
 
 const string Action::getName(){
-  return Traits.getName();
+  return name;
 }
 
@@ -129 +104 @@
   return true;
 }
-