Changeset 9692 in orxonox.OLD for branches/new_class_id/src/lib/shell

Timestamp:

Aug 23, 2006, 12:43:25 AM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: some thoughts on a BaseIterator class, that can travers through ObejectLists without knowing the Polymorph type.
This is all virtual, and since templated virutal functions are not allowed, quite hard to implements…
hpe it will work

Location:

branches/new_class_id/src/lib/shell

Files:

• shell.cc (modified) (2 diffs)
• shell.h (modified) (1 diff)
• shell_buffer.h (modified) (1 diff)
• shell_command.cc (modified) (5 diffs)
• shell_command.h (modified) (1 diff)
• shell_command_class.cc (modified) (3 diffs)
• shell_command_class.h (modified) (3 diffs)
• shell_input.cc (modified) (3 diffs)
• shell_input.h (modified) (1 diff)

branches/new_class_id/src/lib/shell/shell.cc

@@ -54 +54 @@
   ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
 
+  NewObjectListDefinition(Shell);
 
   /**
@@ -60 +61 @@
   Shell::Shell ()
   {
-    this->setClassID(CL_SHELL, "Shell");
+    this->registerObject(this, Shell::_objectList);
+
     this->setName("Shell");
 

branches/new_class_id/src/lib/shell/shell.h

@@ -48 +48 @@
   class Shell : public Element2D, public EventListener
   {
-
+    NewObjectListDeclaration(Shell);
   public:
     Shell();

branches/new_class_id/src/lib/shell/shell_buffer.h

@@ -24 +24 @@
   class ShellBuffer
   {
-
   public:
     virtual ~ShellBuffer();

branches/new_class_id/src/lib/shell/shell_command.cc

@@ -21 +21 @@
 #include "compiler.h"
 #include "debug.h"
-#include "class_list.h"
 
 #include "key_names.h"
@@ -28 +27 @@
 {
   SHELL_COMMAND(debug, ShellCommandClass, help);
+  NewObjectListDefinition(ShellCommand);
 
 
@@ -38 +38 @@
   ShellCommand::ShellCommand(const std::string& commandName, const std::string& className, Executor* executor)
   {
-    this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
+    this->registerObject(this, ShellCommand::_objectList);
     PRINTF(4)("create shellcommand '%s' for class '%s'\n", commandName.c_str(), className.c_str());
     this->setName(commandName);
@@ -94 +94 @@
   void ShellCommand::unregisterCommand(const std::string& commandName, const std::string& className)
   {
-
     ShellCommandClass* cmdClass = ShellCommandClass::acquireCommandClass(className);
     if (cmdClass != NULL)
     {
       CmdList::iterator cmd;
-      for (cmd = cmdClass->commandList.begin(); cmd != cmdClass->commandList.end(); cmd++)
+      for (cmd = cmdClass->_commandList.begin(); cmd != cmdClass->_commandList.end(); cmd++)
         if (commandName == (*cmd)->getName())
         {
@@ -119 +118 @@
 
     CmdList::const_iterator elem;
-    for (unsigned int i = 0; i < cmdClass->commandList.size(); i++)
-    {
-      if (commandName == cmdClass->commandList[i]->getName())
-        return (cmdClass->commandList[i]);
+    for (unsigned int i = 0; i < cmdClass->_commandList.size(); i++)
+    {
+      if (commandName == cmdClass->_commandList[i]->getName())
+        return (cmdClass->_commandList[i]);
     }
     return NULL;

branches/new_class_id/src/lib/shell/shell_command.h

@@ -58 +58 @@
   class ShellCommand : public BaseObject
   {
+    NewObjectListDeclaration(ShellCommand);
+
     friend class ShellCommandClass;
   public:

branches/new_class_id/src/lib/shell/shell_command_class.cc

@@ -21 +21 @@
 
 #include "debug.h"
-#include "class_list.h"
 #include "compiler.h"
 
@@ -28 +27 @@
 namespace OrxShell
 {
+  NewObjectListDefinition(ShellCommandClass);
+
   CmdClassList* ShellCommandClass::commandClassList = NULL;
 
@@ -35 +36 @@
    */
   ShellCommandClass::ShellCommandClass(const std::string& className)
-      : className(className)
-  {
-    this->setClassID(CL_SHELL_COMMAND_CLASS, "ShellCommandClass");
+      : _className(className)
+  {
+    this->registerObject(this, ShellCommandClass::_objectList);
     this->setName(className);
 

branches/new_class_id/src/lib/shell/shell_command_class.h

@@ -25 +25 @@
   class ShellCommandClass : public BaseObject
   {
+    NewObjectListDeclaration(ShellCommandClass);
+
     friend class ShellCommand;
   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);
@@ -34 +36 @@
     static void unregisterAllCommands();
     static ShellCommandClass* getCommandClass(const std::string& className);
-    ClassID getClassID();
+    NewClassID getClassID();
     static bool exists(const std::string& className);
 
@@ -51 +53 @@
 
   private:
-    const std::string                      className;                 //!< The Name of the Class. This should match the ClassName of the Commands Class.
-    ClassID                                classID;                   //!< The classID of this Class
-    CmdList                                commandList;               //!< A list of Commands from this Class
+    const std::string                      _className;                 //!< The Name of the Class. This should match the ClassName of the Commands Class.
+    NewClassID                             _classID;                   //!< The classID of this Class
+    CmdList                                _commandList;               //!< A list of Commands from this Class
 
-    static CmdClassList*                   commandClassList;          //!< A list of Classes
+    static CmdClassList*                   _commandClassList;          //!< A list of Classes
   };
 }

branches/new_class_id/src/lib/shell/shell_input.cc

@@ -24 +24 @@
 #include "compiler.h"
 #include "key_names.h"
+
 
 namespace OrxShell
@@ -31 +32 @@
   ->setAlias("help");
 
+  NewObjectListDefinition(ShellInput);
 
   /**
@@ -39 +41 @@
       : Text ("")
   {
+    this->registerObject(this, ShellInput::_objectList);
+
     this->pressedKey = SDLK_FIRST;
-    this->setClassID(CL_SHELL_INPUT, "ShellInput");
 
     this->inputLine = "";

branches/new_class_id/src/lib/shell/shell_input.h

@@ -30 +30 @@
   class ShellInput : public Text,  public EventListener
   {
+    NewObjectListDeclaration(ShellInput);
 
   public: