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

Timestamp:

Apr 27, 2006, 9:09:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: exist get functions

File:

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

trunk/src/lib/shell/shell_command.cc

@@ -51 +51 @@
 
     //  this->classID = classID;
-    this->shellClass = ShellCommandClass::getCommandClass(className);
+    this->shellClass = ShellCommandClass::acquireCommandClass(className);
     assert (this->shellClass != NULL);
     this->shellClass->registerCommand(this);
@@ -92 +92 @@
   {
 
-    ShellCommandClass* cmdClass = ShellCommandClass::getCommandClass(className);
+    ShellCommandClass* cmdClass = ShellCommandClass::acquireCommandClass(className);
     if (cmdClass != NULL)
     {
@@ -100 +100 @@
           delete (*cmd);
     }
+  }
+
+
+  /**
+   * @brief gets a command if it has already been registered.
+   * @param commandName the name of the Command
+   * @param className the name of the Class the command should apply to.
+   * @returns The Registered Command, or NULL if it does not exist.
+   */
+  const ShellCommand* const ShellCommand::getCommand(const std::string& commandName, const std::string& className)
+  {
+    const ShellCommandClass* checkClass = ShellCommandClass::getCommandClass(className);
+    if (likely(checkClass != NULL))
+    {
+      std::vector<ShellCommand*>::const_iterator elem;
+      for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
+      {
+        if (commandName == (*elem)->getName())
+        {
+          PRINTF(2)("Command '%s::%s' already registered\n", className.c_str(), commandName.c_str());
+          return (*elem);
+        }
+      }
+      return NULL;
+    }
+    else
+      return NULL;
   }
 
@@ -113 +140 @@
   bool ShellCommand::exists(const std::string& commandName, const std::string& className)
   {
-    const ShellCommandClass* checkClass = ShellCommandClass::exists(className);
-    if (likely(checkClass != NULL))
-    {
-      std::vector<ShellCommand*>::const_iterator elem;
-      for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
-      {
-        if (commandName == (*elem)->getName())
-        {
-          PRINTF(2)("Command '%s::%s' already registered\n", className.c_str(), commandName.c_str());
-          return true;
-        }
-      }
-      return false;
-    }
-    else
-      return false;
+    return (ShellCommand::getCommand(commandName, className) != NULL);
   }