Changeset 5206 in orxonox.OLD for trunk/src/lib/shell/shell_buffer.cc

Timestamp:

Sep 19, 2005, 12:31:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shell no more singleton, and ShellInput is now derive from Text correctly

File:

• trunk/src/lib/shell/shell_buffer.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_buffer.cc

@@ -33 +33 @@
 {
   ShellBuffer::singletonRef = this;
+  this->shell = NULL;
 
   this->lineCount = 0;
@@ -50 +51 @@
 ShellBuffer::~ShellBuffer ()
 {
-  if (Shell::isInstanciated())
-    delete Shell::getInstance();
+  if (this->shell != NULL)
+    delete this->shell;
 
   this->flushBuffers();
@@ -58 +59 @@
 
   ShellBuffer::singletonRef = NULL;
+}
+
+/**
+ * registers the Shell to the Buffer
+ * @param shell the Shell to register.
+ */
+void ShellBuffer::registerShell(Shell* shell)
+{
+  if (this->shell == NULL)
+    this->shell = shell;
+  else
+    PRINTF(1)("already registered a Shell to the ShellBuffer\n");
+}
+
+/**
+ * unregisters the Shell from the Buffer
+ * @param shell the Shell to unregister.
+ */
+void ShellBuffer::unregisterShell(Shell* shell)
+{
+  if (this->shell == shell)
+    this->shell = NULL;
+  else
+    PRINTF(1)("cannot unregister shell, because it is not registered to the ShellBuffer\n");
 }
 
@@ -150 +175 @@
     this->lineCount++;
     this->buffer->add(addLine);
-    if (Shell::isInstanciated() && Shell::getInstance()->isActive())
-      Shell::getInstance()->printToDisplayBuffer(addLine);
+    if (likely (this->shell != NULL) && unlikely (this->shell->isActive()))
+      this->shell->printToDisplayBuffer(addLine);
 
     if (this->buffer->getSize() > this->bufferSize)