Changeset 7743 in orxonox.OLD for trunk/src

Timestamp:

May 20, 2006, 4:03:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: All the ShellCommands get Registered correctly again

Location:

trunk/src/lib/shell

Files:

• shell_command_class.cc (modified) (8 diffs)
• shell_command_class.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command_class.cc

@@ -28 +28 @@
 namespace OrxShell
 {
-  CmdClassList ShellCommandClass::commandClassList;
+  CmdClassList* ShellCommandClass::commandClassList = NULL;
 
   /**
@@ -42 +42 @@
     this->classID = CL_NULL;
 
-    printf("::: %d\n", commandClassList.size());
-    ShellCommandClass::commandClassList.push_back(this);
-    printf("::: %d\n", commandClassList.size());
+    if (ShellCommandClass::commandClassList == NULL)
+      ShellCommandClass::commandClassList = new CmdClassList;
+    ShellCommandClass::commandClassList->push_back(this);
   }
 
@@ -54 +54 @@
     while(!this->commandList.empty())
       delete this->commandList.back();
-    CmdClassList::iterator delClass = std::find(ShellCommandClass::commandClassList.begin(), ShellCommandClass::commandClassList.end(), this);
-    if (delClass != ShellCommandClass::commandClassList.end())
-      ShellCommandClass::commandClassList.erase(delClass);
+
+    if (ShellCommandClass::commandClassList != NULL)
+    {
+      CmdClassList::iterator delClass = std::find(ShellCommandClass::commandClassList->begin(), ShellCommandClass::commandClassList->end(), this);
+      if (delClass != ShellCommandClass::commandClassList->end())
+        ShellCommandClass::commandClassList->erase(delClass);
+    }
   }
 
@@ -64 +68 @@
   void ShellCommandClass::registerCommand(ShellCommand* command)
   {
-    printf("::::::::::: ADDED COMMAND:: '%s'\n", command->getName());
     this->commandList.push_back(command);
-    this->help();
   }
 
@@ -87 +89 @@
     // unregister all commands and Classes
     CmdClassList::iterator classIT;
-
-    while (!ShellCommandClass::commandClassList.empty())
-      delete ShellCommandClass::commandClassList.back();
+    if (ShellCommandClass::commandClassList == NULL)
+      return;
+
+    while (!ShellCommandClass::commandClassList->empty())
+      delete ShellCommandClass::commandClassList->back();
+    delete ShellCommandClass::commandClassList;
+    ShellCommandClass::commandClassList = NULL;
   }
 
@@ -101 +107 @@
   bool ShellCommandClass::getCommandListOfClass(const std::string& className, std::list<std::string>& stringList)
   {
+    if (ShellCommandClass::commandClassList == NULL)
+      return false;
+
+
     CmdClassList::const_iterator elem;
-    for(elem = ShellCommandClass::commandClassList.begin(); elem != ShellCommandClass::commandClassList.end(); elem++)
+    for(elem = ShellCommandClass::commandClassList->begin(); elem != ShellCommandClass::commandClassList->end(); elem++)
     {
       if (className == (*elem)->getName())
@@ -123 +133 @@
   ShellCommandClass* ShellCommandClass::getCommandClass(const std::string& className)
   {
+    if (ShellCommandClass::commandClassList == NULL)
+      return false;
+
+
     CmdClassList::const_iterator classIT;
-    for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
+    for (classIT = ShellCommandClass::commandClassList->begin(); classIT != ShellCommandClass::commandClassList->end(); classIT++)
       if (className == (*classIT)->className)
         return (*classIT);
@@ -167 +181 @@
   void ShellCommandClass::help(const std::string& className)
   {
+    if (ShellCommandClass::commandClassList == NULL)
+    {
+      PRINT(0)("No Commands Registered\n");
+      return;
+    }
     if (className.empty())
-      PRINT(0)("===== Displaying %d registered Classes:\n", ShellCommandClass::commandClassList.size());
+      PRINT(0)("===== Displaying %d registered Classes:\n", ShellCommandClass::commandClassList->size());
 
 
     CmdClassList::iterator classIT;
-    for (classIT = ShellCommandClass::commandClassList.begin(); classIT != ShellCommandClass::commandClassList.end(); classIT++)
+    for (classIT = ShellCommandClass::commandClassList->begin(); classIT != ShellCommandClass::commandClassList->end(); classIT++)
     {
       if (className.empty() || className == (*classIT)->className)

trunk/src/lib/shell/shell_command_class.h

@@ -27 +27 @@
   public:
     /** @returns the CommandClassList */
-    static const CmdClassList& getCommandClassList() { return ShellCommandClass::commandClassList; };
+    static const CmdClassList& getCommandClassList() { return *ShellCommandClass::commandClassList; };
 
     static bool getCommandListOfClass(const std::string& className, std::list<std::string>& stringList);
@@ -54 +54 @@
     CmdList                                commandList;               //!< A list of Commands from this Class
 
-    static CmdClassList                    commandClassList;          //!< A list of Classes
+    static CmdClassList*                   commandClassList;          //!< A list of Classes
   };
-
 }