Changeset 1341 for code/branches/console/src/core/Identifier.cc

Timestamp:

May 21, 2008, 1:33:42 AM (16 years ago)

Author:

landauf

Message:

big commit, but not much changes in code:

• put CommandEvaluation into it's own .cc and .h files
• put some basic ConsoleCommands into ConsoleCommandCompilation.cc and .h
• created a new class, ConsoleCommand, inheriting from ExecutorStatic, implementing all command-related features that were located in the Executor until now (at the moment only accessLevel_, but more will come - from reto and me)
• renamed ConsoleCommand-macros to SetConsoleCommand (all related macros were changed the same way)
• added a new command named "killdelays", that kills all delayed commands. helpful to stop disco

File:

• code/branches/console/src/core/Identifier.cc (modified) (4 diffs)

code/branches/console/src/core/Identifier.cc

@@ -37 +37 @@
 
 #include "Factory.h"
-#include "Executor.h"
+#include "ConsoleCommand.h"
 #include "CommandExecutor.h"
 
@@ -270 +270 @@
         @return The executor of the command
     */
-    ExecutorStatic& Identifier::addConsoleCommand(ExecutorStatic* executor, bool bCreateShortcut)
+    ConsoleCommand& Identifier::addConsoleCommand(ConsoleCommand* command, bool bCreateShortcut)
     {
         this->bHasConsoleCommands_ = true;
-        this->consoleCommands_[executor->getName()] = executor;
-        this->consoleCommands_LC_[getLowercase(executor->getName())] = executor;
+        this->consoleCommands_[command->getName()] = command;
+        this->consoleCommands_LC_[getLowercase(command->getName())] = command;
 
         if (bCreateShortcut)
-            CommandExecutor::addConsoleCommandShortcut(executor);
-
-        return (*executor);
+            CommandExecutor::addConsoleCommandShortcut(command);
+
+        return (*command);
     }
 
@@ -287 +287 @@
         @return The executor of the requested console command
     */
-    ExecutorStatic* Identifier::getConsoleCommand(const std::string& name) const
-    {
-        std::map<std::string, ExecutorStatic*>::const_iterator it = this->consoleCommands_.find(name);
+    ConsoleCommand* Identifier::getConsoleCommand(const std::string& name) const
+    {
+        std::map<std::string, ConsoleCommand*>::const_iterator it = this->consoleCommands_.find(name);
         if (it != this->consoleCommands_.end())
             return (*it).second;
@@ -301 +301 @@
         @return The executor of the requested console command
     */
-    ExecutorStatic* Identifier::getLowercaseConsoleCommand(const std::string& name) const
-    {
-        std::map<std::string, ExecutorStatic*>::const_iterator it = this->consoleCommands_LC_.find(name);
+    ConsoleCommand* Identifier::getLowercaseConsoleCommand(const std::string& name) const
+    {
+        std::map<std::string, ConsoleCommand*>::const_iterator it = this->consoleCommands_LC_.find(name);
         if (it != this->consoleCommands_LC_.end())
             return (*it).second;