Changeset 5637 in orxonox.OLD for trunk

Timestamp:

Nov 18, 2005, 7:04:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: using Executor successfully (but with runtime-errors)

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (6 diffs)
• shell_command.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -280 +280 @@
  * @param paramCount the count of parameters this command takes
  */
-ShellCommand::ShellCommand(const char* commandName, const char* className, unsigned int paramCount, ...)
+ShellCommand::ShellCommand(const char* commandName, const char* className, Executor* executor)
 {
   this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
@@ -298 +298 @@
   this->defaultValue = new MultiType[paramCount];
 
-  va_list parameterList;
-  va_start(parameterList, paramCount);
-
-  // What Parameters we have got
-  for (unsigned int i = 0; i < paramCount; i++)
-    this->parameters[i] = va_arg(parameterList, int);
+  this->executor = executor;
 }
 
@@ -325 +320 @@
 ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, Executor* executor)
 {
-  return NULL;
+  if (ShellCommand::isRegistered(commandName, className, executor))
+    return NULL;
+  else
+    return new ShellCommand(commandName, className, executor);
 
 }
@@ -378 +376 @@
  * This is checked in the registerCommand-function.
  */
-bool ShellCommand::isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...)
+bool ShellCommand::isRegistered(const char* commandName, const char* className, Executor* executor)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -447 +445 @@
           {
             if (inputSplits.getCount() > 1)
-              elemAL->getCommand()->executeCommand(objectList->firstElement(), executionString+inputSplits.getOffset(1));
+              elemAL->getCommand()->executor->execute(objectList->firstElement(), executionString+inputSplits.getOffset(1));
             else
-              elemAL->getCommand()->executeCommand(objectList->firstElement(), "");
+              elemAL->getCommand()->executor->execute(objectList->firstElement(), "");
             delete itAL;
             return true;
@@ -516 +514 @@
             }
             if (inputSplits.getCount() > fktPos+1)
-              enumCMD->executeCommand(objectPointer, executionString+inputSplits.getOffset(fktPos +1));
+              enumCMD->executor->execute(objectPointer, executionString+inputSplits.getOffset(fktPos +1));
             else
-              enumCMD->executeCommand(objectPointer, "");
+              enumCMD->executor->execute(objectPointer, "");
             delete itCMD;
             return true;

trunk/src/lib/shell/shell_command.h

@@ -120 +120 @@
 
   protected:
-    ShellCommand(const char* commandName, const char* className, unsigned int paramCount, ...);
+    ShellCommand(const char* commandName, const char* className, Executor* executor);
     ~ShellCommand();
 
@@ -126 +126 @@
     inline ShellCommand_Type getType() { return this->functorType; };
 
-    static bool isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...);
+    static bool isRegistered(const char* commandName, const char* className, Executor* executor);
     static const char* paramToString(long parameter);
-
-  private:
-    /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void executeCommand (BaseObject* object, const char* parameters) = 0;
 
   protected: