Changeset 7186 for code/branches/consolecommands3/src/libraries/core/Executor.cc

Timestamp:

Aug 19, 2010, 2:14:54 AM (14 years ago)

Author:

landauf

Message:

Moved ability to possess descriptions from Executor to ConsoleCommand, since no other executors use this feature. Also simplified this code a little by introducing a new shortcut in Language.h. XMLPort has to use a temporary solution for descriptions without Language support atm.

File:

• code/branches/consolecommands3/src/libraries/core/Executor.cc (modified) (7 diffs)

code/branches/consolecommands3/src/libraries/core/Executor.cc

@@ -36 +36 @@
 #include "util/StringUtils.h"
 #include "util/SubString.h"
-#include "Language.h"
 
 namespace orxonox
@@ -44 +43 @@
         this->functor_ = functor;
         this->name_ = name;
-
-        this->bAddedDescription_ = false;
-        this->bAddedDescriptionReturnvalue_ = false;
-
-        this->bAddedDescriptionParam_[0] = false;
-        this->bAddedDescriptionParam_[1] = false;
-        this->bAddedDescriptionParam_[2] = false;
-        this->bAddedDescriptionParam_[3] = false;
-        this->bAddedDescriptionParam_[4] = false;
 
         this->bAddedDefaultValue_[0] = false;
@@ -69 +59 @@
     {
         unsigned int paramCount = this->functor_->getParamCount();
-       
+
         if (paramCount == 0)
         {
@@ -97 +87 @@
         {
             SubString tokens(params, delimiter, SubString::WhiteSpaces, false, '\\', true, '"', true, '(', ')', true, '\0');
-           
+
             for (unsigned int i = tokens.size(); i < this->functor_->getParamCount(); i++)
             {
@@ -106 +96 @@
                 }
             }
-           
+
             MultiType param[MAX_FUNCTOR_ARGUMENTS];
             COUT(5) << "Calling Executor " << this->name_ << " through parser with " << paramCount << " parameters, using " << tokens.size() << " tokens (";
@@ -129 +119 @@
             }
             COUT(5) << ")." << std::endl;
-           
+
             if ((tokens.size() > paramCount) && (this->functor_->getTypenameParam(paramCount - 1) == "string"))
                 param[paramCount - 1] = tokens.subSet(paramCount - 1).join();
-           
+
             switch(paramCount)
             {
@@ -198 +188 @@
             return true;
         }
-    }
-
-    Executor& Executor::setDescription(const std::string& description)
-    {
-        if (!this->bAddedDescription_)
-        {
-            this->description_ = std::string("ExecutorDescription::" + this->name_ + "::function");
-            AddLanguageEntry(this->description_, description);
-            this->bAddedDescription_ = true;
-        }
-        return (*this);
-    }
-
-    const std::string& Executor::getDescription() const
-    {
-        return GetLocalisation(this->description_);
-    }
-
-    Executor& Executor::setDescriptionParam(unsigned int param, const std::string& description)
-    {
-        if (param < MAX_FUNCTOR_ARGUMENTS)
-        {
-            if (!this->bAddedDescriptionParam_[param])
-            {
-                std::string paramnumber;
-                if (!convertValue(&paramnumber, param))
-                    return (*this);
-
-                this->descriptionParam_[param] = std::string("ExecutorDescription::" + this->name_ + "::param" + paramnumber);
-                AddLanguageEntry(this->descriptionParam_[param], description);
-                this->bAddedDescriptionParam_[param] = true;
-            }
-        }
-        return (*this);
-    }
-
-    const std::string& Executor::getDescriptionParam(unsigned int param) const
-    {
-        if (param < MAX_FUNCTOR_ARGUMENTS)
-            return GetLocalisation(this->descriptionParam_[param]);
-
-        return this->descriptionParam_[0];
-    }
-
-    Executor& Executor::setDescriptionReturnvalue(const std::string& description)
-    {
-        if (!this->bAddedDescriptionReturnvalue_)
-        {
-            this->descriptionReturnvalue_ = std::string("ExecutorDescription::" + this->name_ + "::returnvalue");
-            AddLanguageEntry(this->descriptionReturnvalue_, description);
-            this->bAddedDescriptionReturnvalue_ = true;
-        }
-        return (*this);
-    }
-
-    const std::string& Executor::getDescriptionReturnvalue(int param) const
-    {
-        return GetLocalisation(this->descriptionReturnvalue_);
     }