Changeset 10404

Timestamp:

Apr 26, 2015, 8:47:52 PM (9 years ago)

Author:

landauf

Message:

added unload() function to StaticallyInitializedInstance

Location:

code/branches/core7/src/libraries/core

Files:

• CoreIncludes.h (modified) (1 diff)
• command/ConsoleCommandIncludes.cc (modified) (1 diff)
• command/ConsoleCommandIncludes.h (modified) (1 diff)
• commandline/CommandLineIncludes.h (modified) (1 diff)
• commandline/CommandLineParser.cc (modified) (1 diff)
• commandline/CommandLineParser.h (modified) (1 diff)
• module/ModuleInstance.cc (modified) (1 diff)
• module/ModuleInstance.h (modified) (1 diff)
• module/StaticallyInitializedInstance.h (modified) (1 diff)

code/branches/core7/src/libraries/core/CoreIncludes.h

@@ -246 +246 @@
             }
 
+            virtual void unload()
+            {
+            }
+
             inline Identifier& getIdentifier()
                 { return *this->identifier_; }

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

@@ -37 +37 @@
         ConsoleCommandManager::registerCommand(this->command_);
     }
+
+    void StaticallyInitializedConsoleCommand::unload()
+    {
+        ConsoleCommandManager::unregisterCommand(this->command_);
+    }
 }

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

@@ -313 +313 @@
 
             virtual void load();
+            virtual void unload();
 
             inline ConsoleCommand& getCommand()

code/branches/core7/src/libraries/core/commandline/CommandLineIncludes.h

@@ -63 +63 @@
                 { CommandLineParser::addArgument(this->argument_); }
 
+            virtual void unload()
+                { CommandLineParser::removeArgument(this->argument_); }
+
             inline CommandLineArgument& getArgument()
                 { return *this->argument_; }

code/branches/core7/src/libraries/core/commandline/CommandLineParser.cc

@@ -354 +354 @@
         _getInstance().cmdLineArgs_[argument->getName()] = argument;
     }
+
+    /**
+     * @brief Removes a CommandLineArgument from the internal map.
+     */
+    void CommandLineParser::removeArgument(CommandLineArgument* argument)
+    {
+        _getInstance().cmdLineArgs_.erase(argument->getName());
+    }
 }

code/branches/core7/src/libraries/core/commandline/CommandLineParser.h

@@ -151 +151 @@
         static const MultiType& getValue(const std::string& name)
         { return getArgument(name)->getValue(); }
+
         static void addArgument(CommandLineArgument* argument);
+        static void removeArgument(CommandLineArgument* argument);
 
         static bool existsArgument(const std::string& name)

code/branches/core7/src/libraries/core/module/ModuleInstance.cc

@@ -53 +53 @@
     }
 
+    void ModuleInstance::unloadAllStaticallyInitializedInstances()
+    {
+        for (std::list<StaticallyInitializedInstance*>::iterator it = this->staticallyInitializedInstances_.begin(); it != this->staticallyInitializedInstances_.end(); ++it)
+            (*it)->unload();
+    }
+
     void ModuleInstance::removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance)
     {

code/branches/core7/src/libraries/core/module/ModuleInstance.h

@@ -43 +43 @@
             void addStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
             void loadAllStaticallyInitializedInstances();
+            void unloadAllStaticallyInitializedInstances();
             void removeStaticallyInitializedInstance(StaticallyInitializedInstance* instance);
 

code/branches/core7/src/libraries/core/module/StaticallyInitializedInstance.h

@@ -41 +41 @@
 
             virtual void load() = 0;
+            virtual void unload() = 0;
     };
 }