Changeset 7397 in orxonox.OLD for trunk

Timestamp:

Apr 27, 2006, 4:08:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Aliases better

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (3 diffs)
• shell_command.h (modified) (3 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -162 +162 @@
     {
       // CHECK FOR ALIAS
-      std::vector<ShellCommandAlias*>::iterator alias;
-      for (alias = ShellCommandAlias::aliasList.begin(); alias != ShellCommandAlias::aliasList.end(); alias++ )
+      std::vector<ShellCommandAlias*>::const_iterator alias;
+      for (alias = ShellCommandAlias::getAliases().begin(); alias != ShellCommandAlias::getAliases().end(); alias++ )
       {
         if (inputSplits.getString(0) == (*alias)->getName() && (*alias)->getCommand() != NULL &&
@@ -271 +271 @@
     {
       ShellCommandAlias* aliasCMD = new ShellCommandAlias(alias, this);
-      ShellCommandAlias::aliasList.push_back(aliasCMD);
       this->alias = aliasCMD;
     }
@@ -333 +332 @@
 
 
+  /**
+   * @param aliasName the name of the Alias
+   * @param command the Command, to associate this alias with
+   */
   ShellCommandAlias::ShellCommandAlias(const std::string& aliasName, ShellCommand* command)
   {

trunk/src/lib/shell/shell_command.h

@@ -85 +85 @@
 
   private:
-    ShellCommandClass*               shellClass;                           //!< A Pointer to the Shell-Class this Command belongs to.
-    ShellCommandAlias*               alias;                                //!< An Alias for the Class.
+    ShellCommandClass*               shellClass;            //!< A Pointer to the Shell-Class this Command belongs to.
+    ShellCommandAlias*               alias;                 //!< An Alias for the Class.
 
-    std::string                      description;                          //!< A description for this commnand. (initially ""). Assigned with (create)->describe("blablabla");
-    Executor*                        executor;                             //!< The Executor, that really executes the Function.
+    std::string                      description;           //!< A description for this commnand. (initially ""). Assigned with (create)->describe("blablabla");
+    Executor*                        executor;              //!< The Executor, that really executes the Function.
   };
 
@@ -95 +95 @@
   class ShellCommandAlias
   {
-    friend class ShellCommand;
   public:
+    ShellCommandAlias(const std::string& aliasName, ShellCommand* command);
+    ~ShellCommandAlias();
+
     /** @returns the Name of the Alias. */
     const std::string& getName() const { return this->aliasName; };
@@ -102 +104 @@
     ShellCommand* getCommand() const { return this->command; };
     static bool getCommandListOfAlias(std::list<std::string>& stringList);
+    static const std::vector<ShellCommandAlias*>& getAliases() { return ShellCommandAlias::aliasList; };
 
-  private:
-    /** @param aliasName the name of the Alias @param command the Command, to associate this alias with */
-    ShellCommandAlias(const std::string& aliasName, ShellCommand* command);
-    ~ShellCommandAlias();
   private:
     std::string     aliasName;       //!< the name of the Alias