Changeset 5636 in orxonox.OLD for trunk/src/lib/shell/shell_command.cc

Timestamp:

Nov 18, 2005, 6:55:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: adapting ShellCommand to use Executor.
On the go

File:

• trunk/src/lib/shell/shell_command.cc (modified) (21 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -40 +40 @@
   this->className = className;
   this->classID = CL_NULL;
-  this->commandList = new tList<ShellCommandBase>;
+  this->commandList = new tList<ShellCommand>;
 
   ShellCommandClass::commandClassList->add(this);
@@ -50 +50 @@
 ShellCommandClass::~ShellCommandClass()
 {
-  tIterator<ShellCommandBase>* iterator = this->commandList->getIterator();
-  ShellCommandBase* elem = iterator->firstElement();
+  tIterator<ShellCommand>* iterator = this->commandList->getIterator();
+  ShellCommand* elem = iterator->firstElement();
   while(elem != NULL)
   {
@@ -78 +78 @@
     if (!strcmp (elem->getName(), className))
     {
-      tIterator<ShellCommandBase>* itFkt = elem->commandList->getIterator();
-      ShellCommandBase* command = itFkt->firstElement();
+      tIterator<ShellCommand>* itFkt = elem->commandList->getIterator();
+      ShellCommand* command = itFkt->firstElement();
       while (command != NULL)
       {
@@ -120 +120 @@
 void ShellCommandClass::unregisterAllCommands()
 {
-  // unregister all commands
+  if (ShellCommandClass::commandClassList != NULL)
+  {
+    // unregister all commands
+    tIterator<ShellCommandClass>* iterator = ShellCommandClass::commandClassList->getIterator();
+    ShellCommandClass* elem = iterator->firstElement();
+    while(elem != NULL)
+    {
+      delete elem;
+
+      elem = iterator->nextElement();
+    }
+    delete iterator;
+
+    delete ShellCommandClass::commandClassList;
+    ShellCommandClass::commandClassList = NULL;
+  }
+
+  // unregister all aliases (there should be nothing to do here :))
+  if (ShellCommandClass::aliasList != NULL)
+  {
+    tIterator<ShellCommandAlias>* itAL = ShellCommandClass::aliasList->getIterator();
+    ShellCommandAlias* elemAL = itAL->firstElement();
+    while(elemAL != NULL)
+    {
+      delete elemAL;
+      elemAL = itAL->nextElement();
+    }
+    delete itAL;
+    delete ShellCommandClass::aliasList;
+    ShellCommandClass::aliasList = NULL;
+  }
+}
+
+/**
+ * checks if a Class is already registered to the Commands' class-stack
+ * @param className the Name of the Class to check for
+ * @returns the CommandClass if found, NULL otherwise
+ */
+const ShellCommandClass* ShellCommandClass::isRegistered(const char* className)
+{
+  if (ShellCommandClass::commandClassList == NULL)
+    initCommandClassList();
+
   tIterator<ShellCommandClass>* iterator = ShellCommandClass::commandClassList->getIterator();
   ShellCommandClass* elem = iterator->firstElement();
   while(elem != NULL)
   {
-    delete elem;
-
+    if (!strcmp(className, elem->className))
+    {
+      if (elem->classID == CL_NULL)
+        elem->classID = ClassList::StringToID(className);
+
+      delete iterator;
+      return elem;
+    }
     elem = iterator->nextElement();
   }
   delete iterator;
-
-  delete ShellCommandClass::commandClassList;
-  ShellCommandClass::commandClassList = NULL;
-
-  // unregister all aliases (there should be nothing to do here :))
-  if (ShellCommandClass::aliasList != NULL)
-  {
-    tIterator<ShellCommandAlias>* itAL = ShellCommandClass::aliasList->getIterator();
-    ShellCommandAlias* elemAL = itAL->firstElement();
-    while(elemAL != NULL)
-    {
-      delete elemAL;
-      elemAL = itAL->nextElement();
-    }
-    delete itAL;
-    delete ShellCommandClass::aliasList;
-    ShellCommandClass::aliasList = NULL;
-  }
-}
-
-/**
- * checks if a Class is already registered to the Commands' class-stack
- * @param className the Name of the Class to check for
- * @returns the CommandClass if found, NULL otherwise
- */
-const ShellCommandClass* ShellCommandClass::isRegistered(const char* className)
+  return NULL;
+}
+
+/**
+ * searches for a CommandClass
+ * @param className the name of the CommandClass
+ * @returns the CommandClass if found, or a new CommandClass if not
+ */
+ShellCommandClass* ShellCommandClass::getCommandClass(const char* className)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -166 +197 @@
     if (!strcmp(className, elem->className))
     {
-      if (elem->classID == CL_NULL)
-        elem->classID = ClassList::StringToID(className);
-
       delete iterator;
       return elem;
@@ -175 +203 @@
   }
   delete iterator;
-  return NULL;
-}
-
-/**
- * searches for a CommandClass
- * @param className the name of the CommandClass
- * @returns the CommandClass if found, or a new CommandClass if not
- */
-ShellCommandClass* ShellCommandClass::getCommandClass(const char* className)
+  return new ShellCommandClass(className);
+}
+
+/**
+ * initializes the CommandList (if it is NULL)
+ */
+void ShellCommandClass::initCommandClassList()
 {
   if (ShellCommandClass::commandClassList == NULL)
-    initCommandClassList();
-
-  tIterator<ShellCommandClass>* iterator = ShellCommandClass::commandClassList->getIterator();
-  ShellCommandClass* elem = iterator->firstElement();
-  while(elem != NULL)
-  {
-    if (!strcmp(className, elem->className))
-    {
-      delete iterator;
-      return elem;
-    }
-    elem = iterator->nextElement();
-  }
-  delete iterator;
-  return new ShellCommandClass(className);
-}
-
-/**
- * initializes the CommandList (if it is NULL)
- */
-void ShellCommandClass::initCommandClassList()
-{
-  if (ShellCommandClass::commandClassList == NULL)
   {
     ShellCommandClass::commandClassList = new tList<ShellCommandClass>;
-    ShellCommandStatic<ShellCommandBase>::registerCommand("debug", "ShellCommand", ShellCommandBase::debug);
+    ShellCommand::registerCommand("debug", "ShellCommand", new ExecutorStatic<ShellCommand>(ShellCommand::debug));
   }
 }
@@ -228 +231 @@
       {
         PRINT(0)("Class:'%s' registered %d commands: \n", elemCL->className, elemCL->commandList->getSize());
-        tIterator<ShellCommandBase>* iterator = elemCL->commandList->getIterator();
-        const ShellCommandBase* elem = iterator->firstElement();
+        tIterator<ShellCommand>* iterator = elemCL->commandList->getIterator();
+        const ShellCommand* elem = iterator->firstElement();
         while(elem != NULL)
         {
           PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
           for (unsigned int i = 0; i< elem->paramCount; i++)
-            PRINT(0)("%s ", ShellCommandBase::paramToString(elem->parameters[i]));
+            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));
           if (elem->description != NULL)
             PRINT(0)("- %s", elem->description);
@@ -277 +280 @@
  * @param paramCount the count of parameters this command takes
  */
-ShellCommandBase::ShellCommandBase(const char* commandName, const char* className, unsigned int paramCount, ...)
+ShellCommand::ShellCommand(const char* commandName, const char* className, unsigned int paramCount, ...)
 {
   this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
@@ -306 +309 @@
  * deconstructs a ShellCommand
  */
-ShellCommandBase::~ShellCommandBase()
+ShellCommand::~ShellCommand()
 {
   delete[] this->parameters;
@@ -318 +321 @@
 
 /**
+ * registers a new ShellCommand
+ */
+ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, Executor* executor)
+{
+  return NULL;
+
+}
+
+
+
+
+/**
  * unregister an existing commandName
  * @param className the name of the Class the command belongs to.
  * @param commandName the name of the command itself
  */
-void ShellCommandBase::unregisterCommand(const char* commandName, const char* className)
+void ShellCommand::unregisterCommand(const char* commandName, const char* className)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -331 +346 @@
  if (checkClass != NULL)
   {
-    tIterator<ShellCommandBase>* iterator = checkClass->commandList->getIterator();
-    ShellCommandBase* elem = iterator->firstElement();
+    tIterator<ShellCommand>* iterator = checkClass->commandList->getIterator();
+    ShellCommand* elem = iterator->firstElement();
     while(elem != NULL)
     {
@@ -363 +378 @@
  * This is checked in the registerCommand-function.
  */
-bool ShellCommandBase::isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...)
+bool ShellCommand::isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -374 +389 @@
   if (checkClass != NULL)
   {
-    tIterator<ShellCommandBase>* iterator = checkClass->commandList->getIterator();
-    ShellCommandBase* elem = iterator->firstElement();
+    tIterator<ShellCommand>* iterator = checkClass->commandList->getIterator();
+    ShellCommand* elem = iterator->firstElement();
     while(elem != NULL)
    {
@@ -400 +415 @@
  * @return true on success, false otherwise.
  */
-bool ShellCommandBase::execute(const char* executionString)
+bool ShellCommand::execute(const char* executionString)
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -489 +504 @@
       if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.getCount() >= 3)))
       {
-        tIterator<ShellCommandBase>* itCMD = commandClass->commandList->getIterator();
-        ShellCommandBase* enumCMD = itCMD->firstElement();
+        tIterator<ShellCommand>* itCMD = commandClass->commandList->getIterator();
+        ShellCommand* enumCMD = itCMD->firstElement();
         while (enumCMD != NULL)
         {
@@ -520 +535 @@
  * @param description the description of the Given command
  */
-ShellCommandBase* ShellCommandBase::describe(const char* description)
+ShellCommand* ShellCommand::describe(const char* description)
 {
   if (this == NULL)
@@ -536 +551 @@
  * @returns itself
  */
-ShellCommandBase* ShellCommandBase::setAlias(const char* alias)
+ShellCommand* ShellCommand::setAlias(const char* alias)
 {
   if (this == NULL)
@@ -566 +581 @@
  * count, [EXACTLY THE SAME AS IF YOU WOULD CALL THE FUNCTION UP TO count ARGUMENTS]
  */
-ShellCommandBase* ShellCommandBase::defaultValues(unsigned int count, ...)
+ShellCommand* ShellCommand::defaultValues(unsigned int count, ...)
 {
   if (this == NULL)
@@ -615 +630 @@
  * prints out nice information about the Shells Commands
  */
-void ShellCommandBase::debug()
+void ShellCommand::debug()
 {
   if (ShellCommandClass::commandClassList == NULL)
@@ -628 +643 @@
   {
     PRINT(0)("Class:'%s' registered %d commands: \n", elemCL->className, elemCL->commandList->getSize());
-    tIterator<ShellCommandBase>* iterator = elemCL->commandList->getIterator();
-    const ShellCommandBase* elem = iterator->firstElement();
+    tIterator<ShellCommand>* iterator = elemCL->commandList->getIterator();
+    const ShellCommand* elem = iterator->firstElement();
     while(elem != NULL)
     {
       PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
       for (unsigned int i = 0; i< elem->paramCount; i++)
-       printf("%s ", ShellCommandBase::paramToString(elem->parameters[i]));
+       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));
       if (elem->description != NULL)
        printf("- %s", elem->description);
@@ -652 +667 @@
  * @returns the Name of the Parameter at Hand
  */
-const char* ShellCommandBase::paramToString(long parameter)
+const char* ShellCommand::paramToString(long parameter)
 {
   return MultiType::MultiTypeToString((MT_Type)parameter);