summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2015-01-12 13:54:47 +0100
committerDavid Wagner <david.wagner@intel.com>2015-01-28 20:01:32 +0100
commitfaa623c40bcfba17f222b738c036cd8fdcdd3a4d (patch)
tree78a122bef2592d7405a0482f83b7ba583458d13d /parameter
parent23e217c5edc47e08bd44222a2df0d3a876d3aeec (diff)
downloadexternal_parameter-framework-faa623c40bcfba17f222b738c036cd8fdcdd3a4d.zip
external_parameter-framework-faa623c40bcfba17f222b738c036cd8fdcdd3a4d.tar.gz
external_parameter-framework-faa623c40bcfba17f222b738c036cd8fdcdd3a4d.tar.bz2
Add {get,set}SchemaFolderLocation() to the public Pfw API
It will allow users to tell the parameter-framework where the Schemas are instead of letting it guess. These methods are also added to both "Platform" and "Full" connectors. Change-Id: I7fe3b2fd2c6dba1d90d36de97e6db7d71b2c686f Signed-off-by: David Wagner <david.wagner@intel.com>
Diffstat (limited to 'parameter')
-rw-r--r--parameter/ParameterMgr.cpp10
-rw-r--r--parameter/ParameterMgr.h12
-rw-r--r--parameter/ParameterMgrFullConnector.cpp10
-rw-r--r--parameter/ParameterMgrPlatformConnector.cpp10
-rw-r--r--parameter/include/ParameterMgrFullConnector.h12
-rw-r--r--parameter/include/ParameterMgrPlatformConnector.h12
6 files changed, 66 insertions, 0 deletions
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
index b81243d..1d77666 100644
--- a/parameter/ParameterMgr.cpp
+++ b/parameter/ParameterMgr.cpp
@@ -846,6 +846,16 @@ bool CParameterMgr::getFailureOnFailedSettingsLoad()
return _bFailOnFailedSettingsLoad;
}
+const string& CParameterMgr::getSchemaFolderLocation() const
+{
+ return _strSchemaFolderLocation;
+}
+
+void CParameterMgr::setSchemaFolderLocation(const string& strSchemaFolderLocation)
+{
+ _strSchemaFolderLocation = strSchemaFolderLocation;
+}
+
void CParameterMgr::setValidateSchemasOnStart(bool bValidate)
{
_bValidateSchemasOnStart = bValidate;
diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
index 315cf63..de948ba 100644
--- a/parameter/ParameterMgr.h
+++ b/parameter/ParameterMgr.h
@@ -168,6 +168,18 @@ public:
*/
bool getFailureOnFailedSettingsLoad();
+ /** Get the path to the directory containing the XML Schemas
+ *
+ * @returns the directory containing the XML Schemas
+ */
+ const std::string& getSchemaFolderLocation() const;
+
+ /** Override the directory containing the XML Schemas
+ *
+ * @param[in] strSchemaFolderLocation directory containing the XML Schemas
+ */
+ void setSchemaFolderLocation(const std::string& strSchemaFolderLocation);
+
/** Should .xml files be validated on start ?
*
* @param[in] bValidate:
diff --git a/parameter/ParameterMgrFullConnector.cpp b/parameter/ParameterMgrFullConnector.cpp
index 92a8e04..9cd2441 100644
--- a/parameter/ParameterMgrFullConnector.cpp
+++ b/parameter/ParameterMgrFullConnector.cpp
@@ -120,6 +120,16 @@ bool CParameterMgrFullConnector::getFailureOnFailedSettingsLoad()
return _pParameterMgr->getFailureOnFailedSettingsLoad();
}
+const string& CParameterMgrFullConnector::getSchemaFolderLocation() const
+{
+ return _pParameterMgr->getSchemaFolderLocation();
+}
+
+void CParameterMgrFullConnector::setSchemaFolderLocation(const string& strSchemaFolderLocation)
+{
+ _pParameterMgr->setSchemaFolderLocation(strSchemaFolderLocation);
+}
+
void CParameterMgrFullConnector::setValidateSchemasOnStart(bool bValidate)
{
_pParameterMgr->setValidateSchemasOnStart(bValidate);
diff --git a/parameter/ParameterMgrPlatformConnector.cpp b/parameter/ParameterMgrPlatformConnector.cpp
index 7a8511b..f1ca539 100644
--- a/parameter/ParameterMgrPlatformConnector.cpp
+++ b/parameter/ParameterMgrPlatformConnector.cpp
@@ -128,6 +128,16 @@ bool CParameterMgrPlatformConnector::getFailureOnFailedSettingsLoad()
return _pParameterMgr->getFailureOnFailedSettingsLoad();
}
+const string& CParameterMgrPlatformConnector::getSchemaFolderLocation() const
+{
+ return _pParameterMgr->getSchemaFolderLocation();
+}
+
+void CParameterMgrPlatformConnector::setSchemaFolderLocation(const string& strSchemaFolderLocation)
+{
+ _pParameterMgr->setSchemaFolderLocation(strSchemaFolderLocation);
+}
+
bool CParameterMgrPlatformConnector::setValidateSchemasOnStart(
bool bValidate, std::string& strError)
{
diff --git a/parameter/include/ParameterMgrFullConnector.h b/parameter/include/ParameterMgrFullConnector.h
index 1288c69..63d3cf0 100644
--- a/parameter/include/ParameterMgrFullConnector.h
+++ b/parameter/include/ParameterMgrFullConnector.h
@@ -98,6 +98,18 @@ public:
*/
bool getFailureOnFailedSettingsLoad();
+ /** Get the path to the directory containing the XML Schemas
+ *
+ * @returns the directory containing the XML Schemas
+ */
+ const std::string& getSchemaFolderLocation() const;
+
+ /** Override the directory containing the XML Schemas
+ *
+ * @param[in] strSchemaFolderLocation directory containing the XML Schemas
+ */
+ void setSchemaFolderLocation(const std::string& strSchemaFolderLocation);
+
/** Should .xml files be validated on start ?
*
* @param[in] bValidate:
diff --git a/parameter/include/ParameterMgrPlatformConnector.h b/parameter/include/ParameterMgrPlatformConnector.h
index baa0e7e..d8ae433 100644
--- a/parameter/include/ParameterMgrPlatformConnector.h
+++ b/parameter/include/ParameterMgrPlatformConnector.h
@@ -114,6 +114,18 @@ public:
*/
bool getFailureOnFailedSettingsLoad();
+ /** Get the path to the directory containing the XML Schemas
+ *
+ * @returns the directory containing the XML Schemas
+ */
+ const std::string& getSchemaFolderLocation() const;
+
+ /** Override the directory containing the XML Schemas
+ *
+ * @param[in] strSchemaFolderLocation directory containing the XML Schemas
+ */
+ void setSchemaFolderLocation(const std::string& strSchemaFolderLocation);
+
/** Should .xml files be validated on start ?
*
* @param[in] bValidate: