1 files changed, 36 insertions, 10 deletions
diff --git a/parameter/ConfigurableDomains.cpp b/parameter/ConfigurableDomains.cpp
index 8dff45a..b77e2aa 100644
--- a/parameter/ConfigurableDomains.cpp
+++ b/parameter/ConfigurableDomains.cpp
@@ -127,26 +127,52 @@ bool CConfigurableDomains::createDomain(const string& strName, string& strError)
     return true;
 }
 
-bool CConfigurableDomains::deleteDomain(const string& strName, string& strError)
+bool CConfigurableDomains::addDomain(CConfigurableDomain& domain, bool bOverwrite,
+                                     string& strError)
 {
-    CConfigurableDomain* pConfigurableDomain = findConfigurableDomain(strName, strError);
+    string strErrorDrop;
 
-    if (!pConfigurableDomain) {
+    string strDomainName(domain.getName());
+    CConfigurableDomain* pExistingDomain = findConfigurableDomain(strDomainName, strErrorDrop);
 
-        return false;
-    }
+    if (pExistingDomain) {
+        if (!bOverwrite) {
+            strError = "Can't add domain \"" + strDomainName +
+                "\" because it already exists and overwrite was not requested.";
+            return false;
+        }
 
-    log_info("Deleting configurable domain \"%s\"", strName.c_str());
+        deleteDomain(*pExistingDomain);
+    }
 
-    // Hierarchy
-    removeChild(pConfigurableDomain);
+    log_info("Adding configurable domain \"" + strDomainName + "\"");
 
-    // Destroy
-    delete pConfigurableDomain;
+    addChild(&domain);
 
     return true;
 }
 
+void CConfigurableDomains::deleteDomain(CConfigurableDomain& configurableDomain)
+{
+    log_info("Deleting configurable domain \"" + configurableDomain.getName() + "\"");
+
+    removeChild(&configurableDomain);
+
+    delete &configurableDomain;
+}
+
+bool CConfigurableDomains::deleteDomain(const string& strName, string& strError)
+{
+    CConfigurableDomain* pConfigurableDomain = findConfigurableDomain(strName, strError);
+
+    if (pConfigurableDomain) {
+        deleteDomain(*pConfigurableDomain);
+        return true;
+    }
+
+    return false;
+}
+
 void CConfigurableDomains::deleteAllDomains()
 {
     log_info("Deleting all configurable domains");