[SofaKernel] Refactor the MutationListener

SofaKernel/framework/sofa/core/objectmodel/BaseContext.h

@@ -73,7 +73,7 @@ class SOFA_CORE_API BaseContext : public virtual Base
 
 protected:
     BaseContext();
-    ~BaseContext() override;
+    virtual ~BaseContext() override;
 
 private:
     BaseContext(const BaseContext&);

SofaKernel/framework/sofa/core/objectmodel/BaseNode.h

@@ -100,7 +100,7 @@ class SOFA_CORE_API BaseNode : public virtual Base
     virtual void removeChild(BaseNode::SPtr node) = 0;
 
     /// Move a node from another node
-    virtual void moveChild(BaseNode::SPtr node) = 0;
+    virtual void moveChild(BaseNode::SPtr node, BaseNode::SPtr prev_parent) = 0;
 
     /// Add a generic object
     virtual bool addObject(BaseObject::SPtr obj) = 0;

SofaKernel/framework/sofa/core/objectmodel/BaseObject.cpp

@@ -209,7 +209,7 @@ BaseObject* BaseObject::getSlave(const std::string& name) const
         if ((*iSlaves)->getName() == name)
             return iSlaves->get();
     }
-    return NULL;
+    return nullptr;
 }
 
 void BaseObject::addSlave(BaseObject::SPtr s)

SofaKernel/framework/sofa/core/objectmodel/Context.h

@@ -59,7 +59,7 @@ class SOFA_CORE_API Context : public BaseContext
 
 protected:
     Context();
-    ~Context() override
+    virtual ~Context() override
     {}
 public:
 

SofaKernel/framework/sofa/helper/system/FileRepository.cpp

@@ -275,11 +275,11 @@ void FileRepository::print()
 const std::string FileRepository::getPathsJoined()
 {
     std::ostringstream imploded;
-    char* delim = ":";
+    std::string delim = ":";
 #ifdef WIN32
     delim = ";";
 #endif
-    std::copy(vpath.begin(), vpath.end(), std::ostream_iterator<std::string>(imploded, delim));
+    std::copy(vpath.begin(), vpath.end(), std::ostream_iterator<std::string>(imploded, delim.c_str()));
     std::string implodedStr = imploded.str();
     implodedStr = implodedStr.substr(0, implodedStr.size()-1); // remove trailing separator
     return implodedStr;

SofaKernel/framework/sofa/simulation/MutationListener.cpp

@@ -29,80 +29,82 @@ namespace sofa
 namespace simulation
 {
 
+MutationListener::~MutationListener() {}
 
-MutationListener::~MutationListener()
+void MutationListener::sleepChanged(Node *node) { SOFA_UNUSED(node); }
+
+void MutationListener::onAddChildBegin(Node *parent, Node *child)
 {
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(child);
 }
-
-void MutationListener::addChild(Node* /*parent*/, Node* child)
+void MutationListener::onRemoveChildBegin(Node *parent, Node *child)
 {
-    child->addListener(this);
-    for(Node::ObjectIterator it = child->object.begin(); it != child->object.end(); ++it)
-        addObject(child, it->get());
-    for(Node::ChildIterator it = child->child.begin(); it != child->child.end(); ++it)
-        addChild(child, it->get());
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(child);
 }
 
-void MutationListener::removeChild(Node* /*parent*/, Node* child)
+void MutationListener::onAddObjectBegin(Node *parent,
+                                      core::objectmodel::BaseObject *object)
 {
-    for(Node::ObjectIterator it = child->object.begin(); it != child->object.end(); ++it)
-        removeObject(child, it->get());
-    for(Node::ChildIterator it = child->child.begin(); it != child->child.end(); ++it)
-        removeChild(child, it->get());
-    child->removeListener(this);
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(object);
 }
-
-void MutationListener::addObject(Node* /*parent*/, core::objectmodel::BaseObject* object)
+void MutationListener::onRemoveObjectBegin(Node *parent,
+                                         core::objectmodel::BaseObject *object)
 {
-    const core::objectmodel::BaseObject::VecSlaves& slaves = object->getSlaves();
-    for (unsigned int i=0; i<slaves.size(); ++i)
-        addSlave(object, slaves[i].get());
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(object);
 }
-
-void MutationListener::removeObject(Node* /*parent*/, core::objectmodel::BaseObject* object)
+void MutationListener::onAddSlaveBegin(core::objectmodel::BaseObject *master,
+                                     core::objectmodel::BaseObject *slave)
 {
-    const core::objectmodel::BaseObject::VecSlaves& slaves = object->getSlaves();
-    for (unsigned int i=0; i<slaves.size(); ++i)
-        removeSlave(object, slaves[i].get());
+    SOFA_UNUSED(master);
+    SOFA_UNUSED(slave);
 }
-
-void MutationListener::moveChild(Node* previous, Node* parent, Node* child)
+void MutationListener::onRemoveSlaveBegin(core::objectmodel::BaseObject *master,
+                                        core::objectmodel::BaseObject *slave)
 {
-    removeChild(previous, child);
-    addChild(parent, child);
+    SOFA_UNUSED(master);
+    SOFA_UNUSED(slave);
 }
 
-void MutationListener::moveObject(Node* previous, Node* parent, core::objectmodel::BaseObject* object)
+void MutationListener::onAddChildEnd(Node *parent, Node *child)
 {
-    removeObject(previous, object);
-    addObject(parent, object);
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(child);
 }
-
-void MutationListener::addSlave(core::objectmodel::BaseObject* /*master*/, core::objectmodel::BaseObject* slave)
+void MutationListener::onRemoveChildEnd(Node *parent, Node *child)
 {
-    const core::objectmodel::BaseObject::VecSlaves& slaves = slave->getSlaves();
-    for (unsigned int i=0; i<slaves.size(); ++i)
-        addSlave(slave, slaves[i].get());
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(child);
 }
 
-void MutationListener::removeSlave(core::objectmodel::BaseObject* /*master*/, core::objectmodel::BaseObject* slave)
+void MutationListener::onAddObjectEnd(Node *parent,
+                                    core::objectmodel::BaseObject *object)
 {
-    const core::objectmodel::BaseObject::VecSlaves& slaves = slave->getSlaves();
-    for (unsigned int i=0; i<slaves.size(); ++i)
-        removeSlave(slave, slaves[i].get());
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(object);
 }
-
-void MutationListener::moveSlave(core::objectmodel::BaseObject* previousMaster, core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave)
+void MutationListener::onRemoveObjectEnd(Node *parent,
+                                       core::objectmodel::BaseObject *object)
 {
-    removeSlave(previousMaster, slave);
-    addSlave(master, slave);
+    SOFA_UNUSED(parent);
+    SOFA_UNUSED(object);
 }
-
-void MutationListener::sleepChanged(Node* /*node*/)
+void MutationListener::onAddSlaveEnd(core::objectmodel::BaseObject *master,
+                                   core::objectmodel::BaseObject *slave)
 {
+    SOFA_UNUSED(master);
+    SOFA_UNUSED(slave);
+}
+void MutationListener::onRemoveSlaveEnd(core::objectmodel::BaseObject *master,
+                                      core::objectmodel::BaseObject *slave)
+{
+    SOFA_UNUSED(master);
+    SOFA_UNUSED(slave);
 }
 
 } // namespace simulation
 
 } // namespace sofa
-

SofaKernel/framework/sofa/simulation/MutationListener.h

@@ -22,8 +22,8 @@
 #ifndef SOFA_SIMULATION_CORE_MUTATIONLISTENER_H
 #define SOFA_SIMULATION_CORE_MUTATIONLISTENER_H
 
-#include <sofa/simulation/simulationcore.h>
 #include <sofa/core/objectmodel/BaseObject.h>
+#include <sofa/simulation/simulationcore.h>
 
 namespace sofa
 {
@@ -33,31 +33,45 @@ namespace simulation
 
 class Node;
 
-///Generic API to handle mutations of the graph
+/// Generic API to handle mutations of the graph
 class SOFA_SIMULATION_CORE_API MutationListener
 {
-public:
+  public:
     virtual ~MutationListener();
 
-    virtual void addChild(Node* parent, Node* child);
+    virtual void sleepChanged(Node *node);
+
+    virtual void onAddChildBegin(Node *parent, Node *child);
+
+    virtual void onRemoveChildBegin(Node *parent, Node *child);
+
+    virtual void onAddObjectBegin(Node *parent,
+                             core::objectmodel::BaseObject *object);
 
-    virtual void removeChild(Node* parent, Node* child);
+    virtual void onRemoveObjectBegin(Node *parent,
+                                core::objectmodel::BaseObject *object);
 
-    virtual void moveChild(Node* previous, Node* parent, Node* child);
+    virtual void onAddSlaveBegin(core::objectmodel::BaseObject *master,
+                            core::objectmodel::BaseObject *slave);
 
-    virtual void addObject(Node* parent, core::objectmodel::BaseObject* object);
+    virtual void onRemoveSlaveBegin(core::objectmodel::BaseObject *master,
+                               core::objectmodel::BaseObject *slave);
 
-    virtual void removeObject(Node* parent, core::objectmodel::BaseObject* object);
+    virtual void onAddChildEnd(Node *parent, Node *child);
 
-    virtual void moveObject(Node* previous, Node* parent, core::objectmodel::BaseObject* object);
+    virtual void onRemoveChildEnd(Node *parent, Node *child);
 
-    virtual void addSlave(core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
+    virtual void onAddObjectEnd(Node *parent,
+                             core::objectmodel::BaseObject *object);
 
-    virtual void removeSlave(core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
+    virtual void onRemoveObjectEnd(Node *parent,
+                                core::objectmodel::BaseObject *object);
 
-    virtual void moveSlave(core::objectmodel::BaseObject* previousMaster, core::objectmodel::BaseObject* master, core::objectmodel::BaseObject* slave);
+    virtual void onAddSlaveEnd(core::objectmodel::BaseObject *master,
+                            core::objectmodel::BaseObject *slave);
 
-	virtual void sleepChanged(Node* node);
+    virtual void onRemoveSlaveEnd(core::objectmodel::BaseObject *master,
+                               core::objectmodel::BaseObject *slave);
 };
 
 } // namespace simulation