summaryrefslogtreecommitdiffstats
path: root/parameter/FrameworkConfigurationLocation.cpp
diff options
context:
space:
mode:
authorPatrick Benavoli <patrickx.benavoli@intel.com>2011-11-07 20:32:51 +0100
committerDavid Wagner <david.wagner@intel.com>2014-02-10 17:14:59 +0100
commit95ac034b72580306e9246f7efa3f7ba709a02183 (patch)
tree9dc36b32d1ff881132b3424d761aa3b06c06717d /parameter/FrameworkConfigurationLocation.cpp
parent99041c5b5ed90dd66c65fa1903a74f5f3f9a8fdc (diff)
downloadexternal_parameter-framework-95ac034b72580306e9246f7efa3f7ba709a02183.zip
external_parameter-framework-95ac034b72580306e9246f7efa3f7ba709a02183.tar.gz
external_parameter-framework-95ac034b72580306e9246f7efa3f7ba709a02183.tar.bz2
PFW: file organization
BZ: 12888, 12925, 13285, 13289 - Removed hard coded paths from source files - Separated test related resources and programs into a test subfolder - Schemas folder at root containing the schemas, a symbolic link to that folder might be a good way to enable schema aware editing - Now global configuration file path is passed from the hosting platform instead of the class name. - Global configuration path contains only the relevant class related descriptions (plugin paths, structure, settings) - .user environment file eclipsed through git-ignore (and removed from projects) - Removed system class configuration obsolete files Change-Id: I99b783ba22bca05238a760b2127939a91e976be8 Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com> Reviewed-on: http://android.intel.com:8080/25404 Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com> Tested-by: Barthes, FabienX <fabienx.barthes@intel.com> Reviewed-by: buildbot <buildbot@intel.com> Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/FrameworkConfigurationLocation.cpp')
-rw-r--r--parameter/FrameworkConfigurationLocation.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/parameter/FrameworkConfigurationLocation.cpp b/parameter/FrameworkConfigurationLocation.cpp
index 22f1c7f..b8d9b79 100644
--- a/parameter/FrameworkConfigurationLocation.cpp
+++ b/parameter/FrameworkConfigurationLocation.cpp
@@ -44,7 +44,7 @@ bool CFrameworkConfigurationLocation::fromXml(const CXmlElement& xmlElement, CXm
if (_strPath.empty()) {
- serializingContext.setError("Empty Path attribute in elememnt " + xmlElement.getPath());
+ serializingContext.setError("Empty Path attribute in element " + xmlElement.getPath());
return false;
}
@@ -66,15 +66,11 @@ string CFrameworkConfigurationLocation::getFolderPath(const string& strBaseFolde
{
uint32_t uiSlashPos = _strPath.rfind('/', -1);
- string strFolderPath = ".";
-
if (isPathRelative()) {
if (uiSlashPos != (uint32_t)-1) {
- strFolderPath = _strPath.substr(0, uiSlashPos);
-
- return strBaseFolder + "/" + strFolderPath;
+ return strBaseFolder + "/" + _strPath.substr(0, uiSlashPos);
} else {
@@ -84,9 +80,7 @@ string CFrameworkConfigurationLocation::getFolderPath(const string& strBaseFolde
assert(uiSlashPos != (uint32_t)-1);
- strFolderPath = _strPath.substr(0, uiSlashPos);
-
- return strFolderPath;
+ return _strPath.substr(0, uiSlashPos);
}
}