LayerManagerService: removed plugin management functions from ICommandExecutor

Plugins are now handled by the PluginManager within Layermanager, so
there's no need for the external interface to add or remove different
kind of plugins to the ICommandExecutor.

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/LayerManagerPlugins/Communicators/GenericCommunicator/test/mock_CommandExecutor.h b/LayerManagerPlugins/Communicators/GenericCommunicator/test/mock_CommandExecutor.h
index cbf1f80..6006505 100644 (file)
--- a/LayerManagerPlugins/Communicators/GenericCommunicator/test/mock_CommandExecutor.h
+++ b/LayerManagerPlugins/Communicators/GenericCommunicator/test/mock_CommandExecutor.h
@@ -37,16 +37,9 @@ class MockCommandExecutor : public ICommandExecutor {
   MOCK_METHOD0(getScene, Scene*());
 
   MOCK_METHOD0(getRendererList, RendererList*());
-  MOCK_METHOD1(addRenderer, void(IRenderer* renderer));
-  MOCK_METHOD1(removeRenderer, void(IRenderer* renderer));
-
   MOCK_METHOD0(getCommunicatorList, CommunicatorList*());
-  MOCK_METHOD1(addCommunicator, void(ICommunicator* renderer));
-  MOCK_METHOD1(removeCommunicator, void(ICommunicator* renderer));
-
   MOCK_METHOD0(getSceneProviderList, SceneProviderList*());
-  MOCK_METHOD1(addSceneProvider, void(ISceneProvider* provider));
-  MOCK_METHOD1(removeSceneProvider, void(ISceneProvider* provider));
+  MOCK_METHOD0(getHealthMonitorList, HealthMonitorList*());
 
   MOCK_METHOD0(getApplicationReferenceMap, ApplicationReferenceMap*());
   MOCK_METHOD2(addApplicationReference, void(t_ilm_client_handle client, IApplicationReference* reference));

diff --git a/LayerManagerService/include/ICommandExecutor.h b/LayerManagerService/include/ICommandExecutor.h
index cabc514..581a8a9 100644 (file)
--- a/LayerManagerService/include/ICommandExecutor.h
+++ b/LayerManagerService/include/ICommandExecutor.h
@@ -97,20 +97,6 @@ public:
      */
     virtual RendererList* getRendererList(void) = 0;
 
-    /**
-     * \brief add a renderer to be used for layer management
-     * \ingroup ServiceAPI
-     * \param[in] renderer pointer to renderer object
-     */
-    virtual void addRenderer(IRenderer* renderer) = 0;
-
-    /**
-     * \brief remove renderer from layer management
-     * \ingroup ServiceAPI
-     * \param[in] renderer pointer to renderer object
-     */
-    virtual void removeRenderer(IRenderer* renderer) = 0;
-
     // communicator management
 
     /**
@@ -120,72 +106,24 @@ public:
      */
     virtual CommunicatorList* getCommunicatorList(void) = 0;
 
-    /**
-     *
-     * \brief add a communicator to be used for layer management
-     * \ingroup ServiceAPI
-     * \param[in] communicator pointer to communicator object
-     */
-    virtual void addCommunicator(ICommunicator* communicator) = 0;
-
-    /**
-     *
-     * \brief remove communicator from layer management
-     * \ingroup ServiceAPI
-     * \param[in] communicator pointer to communicator object
-     */
-    virtual void removeCommunicator(ICommunicator* communicator) = 0;
-    
     // scene provider management
-    
+
     /**
      * \brief get list of scene provider plugins currently used
      * \ingroup ServiceAPI
      * \return Pointer to internal list of communicators
      */
     virtual SceneProviderList* getSceneProviderList(void) = 0;
-    
-    /**
-     * 
-     * \brief add a scene provider to be used for layer management
-     * \ingroup ServiceAPI
-     * \param[in] sceneProvider pointer to scene provider object
-     */
-    virtual void addSceneProvider(ISceneProvider* sceneProvider) = 0;
-    
-    /**
-     * 
-     * \brief remove scene provider from layer management
-     * \ingroup ServiceAPI
-     * \param[in] sceneProvider pointer to scene provider object
-     */
-    virtual void removeSceneProvider(ISceneProvider* sceneProvider) = 0;
-    
+
     // health monitor management
-    
+
     /**
      * \brief get list of health monitor plugins currently used
      * \ingroup ServiceAPI
      * \return Pointer to internal list of health monitors
      */
     virtual HealthMonitorList* getHealthMonitorList(void) = 0;
-    
-    /**
-     * 
-     * \brief add a health monitor to be used for layer management
-     * \ingroup ServiceAPI
-     * \param[in] healthMonitor pointer to health monitor object
-     */
-    virtual void addHealthMonitor(IHealthMonitor* healthMonitor) = 0;
-    
-    /**
-     * 
-     * \brief remove health monitor from layer management
-     * \ingroup ServiceAPI
-     * \param[in] healthMonitor pointer to health monitor object
-     */
-    virtual void removeHealthMonitor(IHealthMonitor* healthMonitor) = 0;
-    
+
     // client application management
 
     /**

diff --git a/LayerManagerService/include/Layermanager.h b/LayerManagerService/include/Layermanager.h
index f6c9183..c95789f 100644 (file)
--- a/LayerManagerService/include/Layermanager.h
+++ b/LayerManagerService/include/Layermanager.h
@@ -55,24 +55,12 @@ public:
     virtual uint* getScreenResolution(const uint screenID) const;
     virtual uint* getScreenIDs(uint* length) const;
 
-    virtual void addRenderer(IRenderer* renderer);
-    virtual void removeRenderer(IRenderer* renderer);
-
-    virtual void addCommunicator(ICommunicator* communicator);
-    virtual void removeCommunicator(ICommunicator* communicator);
-
-    virtual void addSceneProvider(ISceneProvider* sceneProvider);
-    virtual void removeSceneProvider(ISceneProvider* sceneProvider);
-
-    virtual void addHealthMonitor(IHealthMonitor* healthMonitor);
-    virtual void removeHealthMonitor(IHealthMonitor* healthMonitor);
-    
     virtual void addApplicationReference(t_ilm_client_handle client, IApplicationReference* reference);
     virtual void removeApplicationReference(t_ilm_client_handle client);
     virtual t_ilm_uint getSenderPid(t_ilm_client_handle client);
     const char* getSenderName(t_ilm_client_handle client);
     const char* getSenderName(unsigned int pid);
-    
+
     virtual bool startManagement();
     virtual bool stopManagement();
 

diff --git a/LayerManagerService/src/Layermanager.cpp b/LayerManagerService/src/Layermanager.cpp
index 9bcc3f7..0e9679d 100644 (file)
--- a/LayerManagerService/src/Layermanager.cpp
+++ b/LayerManagerService/src/Layermanager.cpp
@@ -167,57 +167,6 @@ void Layermanager::signalRendererRedraw()
                renderer->signalWindowSystemRedraw();
 }
 
-void Layermanager::addRenderer(IRenderer* renderer)
-{
-    if (renderer)
-    {
-        m_pRendererList->push_back(renderer);
-        mMonitoredPlugins.push_back(renderer);
-    }
-
-}
-
-void Layermanager::removeRenderer(IRenderer* renderer)
-{
-    if (renderer)
-    {
-        m_pRendererList->remove(renderer);
-        mMonitoredPlugins.remove(renderer);
-    }
-}
-
-void Layermanager::addSceneProvider(ISceneProvider* sceneProvider)
-{
-    if (sceneProvider)
-    {
-        m_pSceneProviderList->push_back(sceneProvider);
-    }
-}
-
-void Layermanager::removeSceneProvider(ISceneProvider* sceneProvider)
-{
-    if (sceneProvider)
-    {
-        m_pSceneProviderList->remove(sceneProvider);
-    }
-}
-
-void Layermanager::addHealthMonitor(IHealthMonitor* healthMonitor)
-{
-    if (healthMonitor)
-    {
-        m_pHealthMonitorList->push_back(healthMonitor);
-    }
-}
-
-void Layermanager::removeHealthMonitor(IHealthMonitor* healthMonitor)
-{
-    if (healthMonitor)
-    {
-        m_pHealthMonitorList->remove(healthMonitor);
-    }
-}
-
 void Layermanager::addApplicationReference(t_ilm_client_handle client, IApplicationReference* reference)
 {
     if (client && reference)
@@ -282,24 +231,6 @@ const char* Layermanager::getSenderName(unsigned int pid)
 }
 
 
-void Layermanager::addCommunicator(ICommunicator* communicator)
-{
-    if (communicator)
-    {
-        m_pCommunicatorList->push_back(communicator);
-        mMonitoredPlugins.push_back(communicator);
-    }
-}
-
-void Layermanager::removeCommunicator(ICommunicator* communicator)
-{
-    if (communicator)
-    {
-        m_pCommunicatorList->remove(communicator);
-        mMonitoredPlugins.remove(communicator);
-    }
-}
-
 void Layermanager::printDebugInformation() const
 {
     // print stuff about layerlist