Changeset 5188 in orxonox.OLD for trunk/src

Timestamp:

Sep 17, 2005, 1:45:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: only retrieve Classes, that actually have a Command associated with them

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/shell/shell_command.cc (modified) (1 diff)
• lib/shell/shell_completion.cc (modified) (6 diffs)

trunk/src/defs/class_id.h

@@ -196 +196 @@
   CL_FAST_FACTORY               =    0x00000c01,
   CL_SHELL_COMMAND              =    0x00000c11,
-  CL_SHELL_INPUT                =    0x00000c12,
-  CL_SHELL_COMPLETION           =    0x00000c13,
+  CL_SHELL_COMMAND_CLASS        =    0x00000c12,
+  CL_SHELL_INPUT                =    0x00000c13,
+  CL_SHELL_COMPLETION           =    0x00000c14,
 
   // Spatial Data Separation

trunk/src/lib/shell/shell_command.cc

@@ -35 +35 @@
 ShellCommandClass::ShellCommandClass(const char* className)
 {
+  this->setClassID(CL_SHELL_COMMAND_CLASS, "ShellCommandClass");
+  this->setName(className);
+
   this->className = className;
   this->classID = CL_NULL;

trunk/src/lib/shell/shell_completion.cc

@@ -49 +49 @@
   if (this->completionList)
   {
+    this->emptyCompletionList();
     delete this->completionList;
   }
@@ -85 +86 @@
   }
   if (this->input->getInput() == NULL)
-    return this->classComplete("");
+    return this->objectComplete("", CL_SHELL_COMMAND_CLASS);
 
 
@@ -97 +98 @@
   {
     PRINTF(5)("Listing all Classes\n");
-    this->classComplete("");
+    this->objectComplete("", CL_SHELL_COMMAND_CLASS);
     return false;
   }
   else if (inputSplits.getCount() == 1 && strlen(inputSplits.getString(0)) == strlen(completionLine))
   {
-    printf("trying to complete a Class with %d\n", inputSplits.getString(0));
-    this->classComplete(inputSplits.getString(0));
+    printf("trying to complete a Class with '%s'\n", inputSplits.getString(0));
+    this->objectComplete(inputSplits.getString(0), CL_SHELL_COMMAND_CLASS);
   }
 
@@ -182 +183 @@
 bool ShellCompletion::objectComplete(const char* objectBegin, long classID)
 {
-  printf("%s\n", objectBegin);
-
   if (unlikely(objectBegin == NULL))
     return false;
@@ -189 +188 @@
   if (boList != NULL)
   {
-    printf("\n", boList->firstElement()->getName());
+    //printf("%s\n", boList->firstElement()->getName());
     const tList<ShellC_Element>* objectList = this->addToCompleteList(boList, objectBegin);
     if (objectList != NULL)
@@ -325 +324 @@
       newElem->name = enumBO->getName();
       this->completionList->add(newElem);
+      printf("%s\n",enumBO->getName());
     }
     enumBO = iterator->nextElement();