Index: trunk/src/util/loading/load_param.cc
===================================================================
--- trunk/src/util/loading/load_param.cc	(revision 5654)
+++ trunk/src/util/loading/load_param.cc	(revision 5655)
@@ -24,88 +24,4 @@
 
 #include <stdarg.h>
-
-/**
- * @param object The object this Parameter is loaded too.
- * @param root: the XML-element to load this option from.
- * @param paramName: The name of the parameter loaded.
- * @param paramCount: how many parameters this loading-function takes
- * @param multi: if false LoadParam assumes only one occurence of this parameter in root, if true it assumes multiple occurences.
- * @param ...: the parameter information (1. Parameter, 2. Default Value for the Parameter, ...)
-*/
-LoadParamBase::LoadParamBase(const TiXmlElement* root, BaseObject* object, const char* paramName,
-                             int paramCount, bool multi, const void* pointerToParam, ...)
-{
-  this->setClassID(CL_LOAD_PARAM, "LoadParam");
-  this->executor = NULL;
-
-  this->loadString = NULL;
-  this->pointerToParam = pointerToParam;
-
-  if (paramCount == 0 || this->pointerToParam != NULL)
-    this->loadString = "none";
-  else
-    {
-      if (likely(!multi))
-        this->loadString = grabParameter(root, paramName);
-      else
-        {
-          if (!strcmp(root->Value(), paramName))
-            {
-              const TiXmlNode* val = root->FirstChild();
-              if( val->ToText())
-                this->loadString = val->Value();
-            }
-        }
-    }
-
-  this->paramDesc = NULL;
-  if (LoadClassDescription::parametersDescription)
-  {
-    // locating the class
-    this->classDesc = LoadClassDescription::addClass(object->getClassName());
-
-    if ((this->paramDesc = this->classDesc->addParam(paramName)) != NULL)
-    {
-
-      this->paramDesc->paramCount = paramCount;
-      this->paramDesc->types = new int[paramCount];
-      this->paramDesc->defaultValues = new char*[paramCount];
-
-      va_list types;
-      va_start (types, pointerToParam);
-      char defaultVal[512];
-      for(int i = 0; i < paramCount; i++)
-      {
-        defaultVal[0] = '\0';
-          // parameters parsed
-        int tmpType = va_arg (types, int);
-        this->paramDesc->types[i] = tmpType;
-        switch (tmpType)
-        {
-          case MT_INT:
-            sprintf(defaultVal, "%d", va_arg(types, int));
-            break;
-/*          case MT_LONG:
-            sprintf(defaultVal, "%0.3f", va_arg(types, l_LONG_TYPE));
-            break;*/
-          case MT_FLOAT:
-            sprintf(defaultVal, "%0.3f", va_arg(types, double));
-            break;
-          case MT_STRING:
-            sprintf(defaultVal, "%s", va_arg(types, l_STRING_TYPE));
-            break;
-          case MT_EXT1:
-            sprintf(defaultVal, "");
-            break;
-        }
-        this->paramDesc->defaultValues[i] = new char[strlen(defaultVal)+1];
-        strcpy(this->paramDesc->defaultValues[i], defaultVal);
-      }
-      va_end(types);
-
-      int argCount = 0;
-    }
-  }
-}
 
 /**
@@ -116,5 +32,5 @@
  * @param executor the Executor, that executes the loading procedure.
  */
-LoadParamBase::LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle)
+LoadParam::LoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle)
 {
   this->paramName = paramName;
@@ -147,5 +63,5 @@
  * Execution-Conditions are met, they are executed here.
  */
-LoadParamBase::~LoadParamBase()
+LoadParam::~LoadParam()
 {
   if (likely(this->executor != NULL))
@@ -168,5 +84,5 @@
  * @param ... the default values !! must be at least count parameters!!
  */
-LoadParamBase* LoadParamBase::defaultValues(unsigned int count, ...)
+LoadParam* LoadParam::defaultValues(unsigned int count, ...)
 {
   if (this == NULL)
@@ -188,5 +104,5 @@
  * @returns a pointer to itself.
 */
-LoadParamBase* LoadParamBase::describe(const char* descriptionText)
+LoadParam* LoadParam::describe(const char* descriptionText)
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
@@ -215,4 +131,103 @@
 // }
 
+
+
+
+/*
+ * @param object The object this Parameter is loaded too.
+ * @param root: the XML-element to load this option from.
+ * @param paramName: The name of the parameter loaded.
+ * @param paramCount: how many parameters this loading-function takes
+ * @param multi: if false LoadParam assumes only one occurence of this parameter in root, if true it assumes multiple occurences.
+ * @param ...: the parameter information (1. Parameter, 2. Default Value for the Parameter, ...)
+*/
+/*LoadParam::LoadParam(const TiXmlElement* root, BaseObject* object, const char* paramName,
+                             int paramCount, bool multi, const void* pointerToParam, ...)
+{
+  this->setClassID(CL_LOAD_PARAM, "LoadParam");
+  this->executor = NULL;
+
+  this->loadString = NULL;
+  this->pointerToParam = pointerToParam;
+
+  if (paramCount == 0 || this->pointerToParam != NULL)
+    this->loadString = "none";
+  else
+{
+      if (likely(!multi))
+        this->loadString = grabParameter(root, paramName);
+      else
+{
+          if (!strcmp(root->Value(), paramName))
+{
+              const TiXmlNode* val = root->FirstChild();
+              if( val->ToText())
+                this->loadString = val->Value();
+}
+}
+}
+
+  this->paramDesc = NULL;
+  if (LoadClassDescription::parametersDescription)
+{
+    // locating the class
+    this->classDesc = LoadClassDescription::addClass(object->getClassName());
+
+    if ((this->paramDesc = this->classDesc->addParam(paramName)) != NULL)
+{
+
+      this->paramDesc->paramCount = paramCount;
+      this->paramDesc->types = new int[paramCount];
+      this->paramDesc->defaultValues = new char*[paramCount];
+
+      va_list types;
+      va_start (types, pointerToParam);
+      char defaultVal[512];
+      for(int i = 0; i < paramCount; i++)
+{
+        defaultVal[0] = '\0';
+          // parameters parsed
+        int tmpType = va_arg (types, int);
+        this->paramDesc->types[i] = tmpType;
+        switch (tmpType)
+{
+  case MT_INT:
+            sprintf(defaultVal, "%d", va_arg(types, int));
+            break;
+//          case MT_LONG:
+//            sprintf(defaultVal, "%0.3f", va_arg(types, l_LONG_TYPE));
+//            break;
+  case MT_FLOAT:
+            sprintf(defaultVal, "%0.3f", va_arg(types, double));
+            break;
+  case MT_STRING:
+            sprintf(defaultVal, "%s", va_arg(types, l_STRING_TYPE));
+            break;
+  case MT_EXT1:
+            sprintf(defaultVal, "");
+            break;
+}
+        this->paramDesc->defaultValues[i] = new char[strlen(defaultVal)+1];
+        strcpy(this->paramDesc->defaultValues[i], defaultVal);
+}
+      va_end(types);
+
+      int argCount = 0;
+}
+}
+}*/
+
+
+
+
+
+
+
+
+
+
+//////////////////////
+// HELPER FUNCTIONS //
+//////////////////////
 /**
  * @param root: The XML-element to grab a parameter from
