Changeset 10354

Timestamp:

Apr 11, 2015, 10:36:15 PM (10 years ago)

Author:

landauf

Message:

moved code from static initializer into new function in ConsoleCommandManager

Location:

code/branches/core7/src/libraries/core/command

Files:

• ConsoleCommandIncludes.cc (modified) (1 diff)
• ConsoleCommandManager.cc (modified) (1 diff)
• ConsoleCommandManager.h (modified) (1 diff)

code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.cc

@@ -35 +35 @@
     void StaticallyInitializedConsoleCommand::load()
     {
-        for (size_t i = 0; i < this->command_->getNames().size(); ++i)
-        {
-            const ConsoleCommand::CommandName& name = this->command_->getNames()[i];
-            ConsoleCommandManager::registerCommand(name.group_, name.name_, this->command_);
-        }
+        ConsoleCommandManager::registerCommand(this->command_);
     }
 }

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.cc

@@ -118 +118 @@
         static std::map<std::string, std::map<std::string, ConsoleCommand*> > commandMapLC;
         return commandMapLC;
+    }
+
+    /**
+        @brief Registers a new command with the groups and names that are defined by ConsoleCommand::getNames().
+    */
+    /* static */ void ConsoleCommandManager::registerCommand(ConsoleCommand* command)
+    {
+        for (size_t i = 0; i < command->getNames().size(); ++i)
+        {
+            const ConsoleCommand::CommandName& name = command->getNames()[i];
+            ConsoleCommandManager::registerCommand(name.group_, name.name_, command);
+        }
     }
 

code/branches/core7/src/libraries/core/command/ConsoleCommandManager.h

@@ -45 +45 @@
     {
         public:
+            static void registerCommand(ConsoleCommand* command);
             static void registerCommand(const std::string& group, const std::string& name, ConsoleCommand* command);
             static void unregisterCommand(ConsoleCommand* command);