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>
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 @@
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 @@
{
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 @@
assert(uiSlashPos != (uint32_t)-1);
- strFolderPath = _strPath.substr(0, uiSlashPos);
-
- return strFolderPath;
+ return _strPath.substr(0, uiSlashPos);
}
}