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

Timestamp:

Apr 28, 2006, 11:31:09 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Better implementation

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (5 diffs)
• shell_command.h (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -168 +168 @@
       {
         assert ((*alias)->getCommand() != NULL && (*alias)->getCommand()->shellClass != NULL);
+        // Search for Objects.
+        if (strings.size() == 1)
+          fillObjectList("", (*alias)->getCommand(), boList);
+        else
+        {
+          if (!fillObjectList(strings[1], (*alias)->getCommand(), boList))
+            fillObjectList("", (*alias)->getCommand(), boList);
+        }
         return (*alias)->getCommand();
       }
@@ -180 +188 @@
       if (strings.size() >= 1)
       {
+        // Search for Objects.
         retCmd = ShellCommand::getCommand(strings[1], cmdClass);
         if (retCmd != NULL)
         {
           paramBegin = 2;
+          fillObjectList("", retCmd, boList);
           return retCmd;
         }
@@ -194 +204 @@
         {
           paramBegin = 3;
+          fillObjectList(strings[1], retCmd, boList);
           return retCmd;
         }
@@ -205 +216 @@
   }
 
-  bool ShellCommand::fillObjectList(const std::string& objectDescriptor, ShellCommand* cmd, std::vector<BaseObject*>* boList)
-  {
-    assert (cmd != NULL && cmd->shellClass != NULL && boList != NULL);
+  /**
+   * @brief fills the ObjectList boList with Objects that can be reffered to by cmd.
+   * @param objectDescriptor: the ObjectName (beginning, full name or empty) to fill the List with
+   * @param cmd: The Command to complete Objects for.
+   * @param boList: The List of BaseObject's that will be filled with found entries.
+   * @returns: true if more than one Entry was fond, else (false , or if boList is NULL).
+   */
+  bool ShellCommand::fillObjectList(const std::string& objectDescriptor, const ShellCommand* cmd, std::vector<BaseObject*>* boList)
+  {
+    assert (cmd != NULL && cmd->shellClass != NULL);
+    if(boList == NULL)
+      return false;
 
     const std::list<BaseObject*>* objectList = ClassList::getList(cmd->shellClass->getName());
@@ -228 +248 @@
       }
     }
+    return !boList->empty();
   }
 

trunk/src/lib/shell/shell_command.h

@@ -90 +90 @@
     virtual ~ShellCommand();
 
-    static bool fillObjectList(const std::string& objectDescriptor, ShellCommand* cmd, std::vector<BaseObject*>* boList);
+    static bool fillObjectList(const std::string& objectDescriptor, const ShellCommand* cmd, std::vector<BaseObject*>* boList);
     static const std::string& paramToString(long parameter);