Changeset 7399 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 27, 2006, 4:33:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: register unregister much better

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (3 diffs)
• shell_command_class.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -51 +51 @@
     this->shellClass = ShellCommandClass::getCommandClass(className);
     assert (this->shellClass != NULL);
-    this->shellClass->commandList.push_back(this);
+    this->shellClass->registerCommand(this);
   }
 
@@ -59 +59 @@
   ShellCommand::~ShellCommand()
   {
+    this->shellClass->unregisterCommand(this);
     if (this->alias != NULL)
       delete this->alias;
@@ -83 +84 @@
   void ShellCommand::unregisterCommand(const std::string& commandName, const std::string& className)
   {
-    /// FIXME
-    /*  if (ShellCommandClass::commandClassList == NULL)
-        ShellCommandClass::initCommandClassList();
-
-     const ShellCommandClass* checkClass = ShellCommandClass::isRegistered(className);
-
-     if (checkClass != NULL)
-      {
-        std::list<ShellCommand*>::iterator elem;
-        for (elem = checkClass->commandList.begin(); elem != checkClass->commandList.end(); elem++)
-        {
-          if (!strcmp(commandName, (*elem)->getName()))
-          {
-            delete (*elem);
-            checkClass->commandList.remove(*elem);
-            break;
-          }
-        }
-
-        if (checkClass->commandList->size() == 0)
-        {
-          ShellCommandClass::commandClassList->remove(checkClass);
-          delete checkClass;
-        }
-      }*/
+
+    ShellCommandClass* cmdClass = ShellCommandClass::getCommandClass(className);
+    if (cmdClass != NULL)
+    {
+      std::vector<ShellCommand*>::iterator cmd;
+      for (cmd = cmdClass->commandList.begin(); cmd < cmdClass->commandList.end(); cmd++)
+      {
+        if (commandName == (*cmd)->getName())
+        {
+          delete (*cmd);
+        }
+      }
+    }
   }
 

trunk/src/lib/shell/shell_command_class.cc

@@ -49 +49 @@
   {
     while(!this->commandList.empty())
-    {
       delete this->commandList.back();
-      this->commandList.pop_back();
-    }
   }