Changeset 9727 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/load_param.cc

Timestamp:

Sep 14, 2006, 5:24:31 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: new Executor construct, that is much more typesafe, faster, and easier to extend…

Also changed the LoadParam process, and adapted ScriptEngine calls

Then at the end, some missing headers appeared, and appended them to all the cc-files again.

File:

• branches/new_class_id/src/lib/util/loading/load_param.cc (modified) (5 diffs)

branches/new_class_id/src/lib/util/loading/load_param.cc

@@ -18 +18 @@
 #include "util/loading/load_param.h"
 #include "load_param_description.h"
-
-#include <stdarg.h>
-
+#include "compiler.h"
+#include "debug.h"
 /**
  * Constructs a new LoadParameter
@@ -28 +27 @@
  * @param executor the Executor, that executes the loading procedure.
  */
-CLoadParam::CLoadParam(const TiXmlElement* root, const std::string& paramName, BaseObject* object, Executor* executor, bool inLoadCycle)
-  :  object(object), paramName(paramName)
-{
-  this->inLoadCycle = inLoadCycle;
-
+LoadParamBase::LoadParamBase(const TiXmlElement* root, const std::string& paramName, BaseObject* object, bool inLoadCycle)
+    :  object(object), paramName(paramName), inLoadCycle(inLoadCycle)
+{
   // determin the LoadString.
   if (likely(!inLoadCycle))
@@ -40 +37 @@
   else
     this->loadElem = NULL;
-
+}
+
+
+/**
+ * @param descriptionText The text to set as a description for this Parameter
+ * @returns a pointer to itself.
+ */
+void LoadParamBase::describe(const std::string& descriptionText)
+{
+  if (LoadClassDescription::parametersDescription && this->paramDesc && this->paramDesc->getDescription().empty())
+  {
+    this->paramDesc->setDescription(descriptionText);
+  }
+}
+
+
+
+
+CLoadParam::CLoadParam(const TiXmlElement* root, const std::string& paramName, BaseObject* object, Executor<const SubString>* executor, bool inLoadCycle)
+    : LoadParamBase(root, paramName, object, inLoadCycle)
+{
+  assert (executor != NULL);
   // set the Executor.
   this->executor = executor;
-
   //if (this->executor)
   //  this->executor->setName(paramName);
@@ -56 +73 @@
 CLoadParam::~CLoadParam()
 {
-  if (likely(this->executor != NULL))
-  {
-    std::string loadString = "";
-    if (this->loadElem != NULL &&  this->loadElem->ToText())
-      loadString = this->loadElem->Value();
-    if (likely(this->object != NULL) &&
-        ( !loadString.empty() ||
-          ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
+  assert(this->object != NULL);
+
+  std::string loadString;
+  if (this->loadElem != NULL &&  this->loadElem->ToText())
+  {
+    loadString = this->loadElem->Value();
+    if (!loadString.empty())
     {
-      PRINTF(4)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassCName(), this->object->getCName());
+      PRINTF(0)("Loading value '%s' with Parameters '%s' onto: %s::%s\n",
+                this->paramName.c_str(), loadString.c_str(), this->object->getClassCName(), this->object->getCName());
       (*this->executor)(this->object, SubString(loadString, ",", SubString::WhiteSpaces, false, '\\'));
     }
-    delete this->executor;
-  }
+  }
+  delete this->executor;
 }
 
@@ -90 +107 @@
 }
 
-
-
-/**
- * @param descriptionText The text to set as a description for this Parameter
- * @returns a pointer to itself.
-*/
-CLoadParam& CLoadParam::describe(const std::string& descriptionText)
-{
-  if (LoadClassDescription::parametersDescription && this->paramDesc && this->paramDesc->getDescription().empty())
-  {
-    this->paramDesc->setDescription(descriptionText);
-  }
-  return *this;
-}
 
 // const LoadParamDescription* LoadParamDescription::getClass(const char* className)