From 6ba361d96bc2581667b3400f87ff89fae6449e1f Mon Sep 17 00:00:00 2001 From: Patrick Benavoli Date: Wed, 31 Aug 2011 11:23:24 +0200 Subject: parameter-framework: improvements and corrections BZ: 6721 - Bug correction concerning selection criteria display (inclusive type) - Adapted XML format to allow for only on parameter to be associated to a domain - Removed unused files in parameter project Change-Id: I9f42d08ff8cb60354714fe3d6b0f0b321ad0a7bf Orig-Change-Id: I837e553070f5acf2d275082c986ba29433493e31 Signed-off-by: Patrick Benavoli Reviewed-on: http://android.intel.com:8080/16878 Reviewed-by: Mahe, Erwan Tested-by: Barthes, FabienX Reviewed-by: buildbot Tested-by: buildbot --- parameter/Parameter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'parameter/Parameter.cpp') diff --git a/parameter/Parameter.cpp b/parameter/Parameter.cpp index 5f1f389..57a78b1 100644 --- a/parameter/Parameter.cpp +++ b/parameter/Parameter.cpp @@ -50,16 +50,16 @@ CInstanceConfigurableElement::Type CParameter::getType() const } // XML configuration settings parsing/composing -bool CParameter::serializeXmlSettings(CXmlElement& xmlConfigurableElementSettingsElement, CConfigurationAccessContext& configurationAccessContext) const +bool CParameter::serializeXmlSettings(CXmlElement& xmlConfigurationSettingsElementContent, CConfigurationAccessContext& configurationAccessContext) const { // Check for value space - handleValueSpaceAttribute(xmlConfigurableElementSettingsElement, configurationAccessContext); + handleValueSpaceAttribute(xmlConfigurationSettingsElementContent, configurationAccessContext); // Handle access if (!configurationAccessContext.serializeOut()) { // Write to blackboard - if (!doSetValue(xmlConfigurableElementSettingsElement.getTextContent(), getOffset() - configurationAccessContext.getBaseOffset(), configurationAccessContext)) { + if (!doSetValue(xmlConfigurationSettingsElementContent.getTextContent(), getOffset() - configurationAccessContext.getBaseOffset(), configurationAccessContext)) { // Append parameter path to error configurationAccessContext.appendToError(" " + getPath()); @@ -74,7 +74,7 @@ bool CParameter::serializeXmlSettings(CXmlElement& xmlConfigurableElementSetting doGetValue(strValue, getOffset() - configurationAccessContext.getBaseOffset(), configurationAccessContext); // Populate value into xml text node - xmlConfigurableElementSettingsElement.setTextContent(strValue); + xmlConfigurationSettingsElementContent.setTextContent(strValue); } // Done -- cgit v1.1