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

Timestamp:

Apr 27, 2006, 1:33:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: list to vector

File:

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

trunk/src/lib/shell/shell_command.cc

@@ -27 +27 @@
 namespace OrxShell
 {
-
-  /**
-   * constructs and registers a new Command
+  SHELL_COMMAND_STATIC(debug, ShellCommand, ShellCommand::debug);
+
+
+  /**
+   * @brief constructs and registers a new Command
    * @param commandName the name of the Command
    * @param className the name of the class to apply this command to
@@ -50 +52 @@
 
   /**
-   * deconstructs a ShellCommand
+   * @brief deconstructs a ShellCommand
    */
   ShellCommand::~ShellCommand()
@@ -106 +108 @@
 
   /**
-   * checks if a command has already been registered.
+   * @brief checks if a command has already been registered.
    * @param commandName the name of the Command
    * @param className the name of the Class the command should apply to.
@@ -116 +118 @@
   bool ShellCommand::isRegistered(const std::string& commandName, const std::string& className)
   {
-    if (ShellCommandClass::commandClassList == NULL)
-    {
-      ShellCommandClass::initCommandClassList();
-      return false;
-    }
-
     const ShellCommandClass* checkClass = ShellCommandClass::isRegistered(className);
     if (checkClass != NULL)
@@ -142 +138 @@
 
   /**
-   * executes commands
+   * @brief executes commands
    * @param executionString the string containing the following input
    * ClassName [ObjectName] functionName [parameter1[,parameter2[,...]]]
@@ -149 +145 @@
   bool ShellCommand::execute(const std::string& executionString)
   {
-    if (ShellCommandClass::commandClassList == NULL)
-      return false;
-
     long classID = CL_NULL;                      //< the classID retrieved from the Class.
     ShellCommandClass* commandClass = NULL;      //< the command class this command applies to.
@@ -186 +179 @@
 
       // looking for a Matching Class
-      if (likely(ShellCommandClass::commandClassList != NULL))
-      {
-        std::list<ShellCommandClass*>::iterator commandClassIT;
-        for (commandClassIT = ShellCommandClass::commandClassList->begin(); commandClassIT != ShellCommandClass::commandClassList->end(); commandClassIT++)
-        {
-          if ((*commandClassIT)->getName() && inputSplits[0] == (*commandClassIT)->getName())
-          {
-            //elemCL->getName();
-            classID = ClassList::StringToID((*commandClassIT)->getName());
-            commandClass = (*commandClassIT);
-            objectList = ClassList::getList((ClassID)classID);
-            break;
-          }
+      std::vector<ShellCommandClass*>::iterator commandClassIT;
+      for (commandClassIT = ShellCommandClass::commandClassList.begin(); commandClassIT != ShellCommandClass::commandClassList.end(); commandClassIT++)
+      {
+        if ((*commandClassIT)->getName() && inputSplits[0] == (*commandClassIT)->getName())
+        {
+          //elemCL->getName();
+          classID = ClassList::StringToID((*commandClassIT)->getName());
+          commandClass = (*commandClassIT);
+          objectList = ClassList::getList((ClassID)classID);
+          break;
         }
       }
@@ -312 +302 @@
   void ShellCommand::debug()
   {
-    if (ShellCommandClass::commandClassList == NULL)
-    {
-      PRINT(0)("No Command registered.\n");
-      return;
-    }
-
-    std::list<ShellCommandClass*>::iterator classIT;
-    for (classIT = ShellCommandClass::commandClassList->begin(); classIT != ShellCommandClass::commandClassList->end(); classIT++)
+    std::vector<ShellCommandClass*>::iterator classIT;
+    for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
     {
       PRINT(0)("Class:'%s' registered %d commands: \n", (*classIT)->className.c_str(), (*classIT)->commandList.size());