commit 6ba361d96bc2581667b3400f87ff89fae6449e1f
author Patrick Benavoli <patrickx.benavoli@intel.com> Wed Aug 31 11:23:24 2011 +0200
committer David Wagner <david.wagner@intel.com> Mon Feb 10 17:13:21 2014 +0100
tree e72e959d7d4c3b0f0b6dc20ec4f07d957eae1a50
parent 68a912857707864bbaaff9808717813105072a6e

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 <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/16878
Reviewed-by: Mahe, Erwan <erwan.mahe@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

parameter/ArrayParameter.cpp

diff --git a/parameter/ArrayParameter.cpp b/parameter/ArrayParameter.cpp
index 2cdae2f..abb3f6d 100644
--- a/parameter/ArrayParameter.cpp
+++ b/parameter/ArrayParameter.cpp
@@ -48,16 +48,16 @@
 }
 
 // XML configuration settings parsing
-bool CArrayParameter::serializeXmlSettings(CXmlElement& xmlConfigurableElementSettingsElement, CConfigurationAccessContext& configurationAccessContext) const
+bool CArrayParameter::serializeXmlSettings(CXmlElement& xmlConfigurationSettingsElementContent, CConfigurationAccessContext& configurationAccessContext) const
 {
     // Check for value space
-    handleValueSpaceAttribute(xmlConfigurableElementSettingsElement, configurationAccessContext);
+    handleValueSpaceAttribute(xmlConfigurationSettingsElementContent, configurationAccessContext);
 
     // Handle access
     if (!configurationAccessContext.serializeOut()) {
 
         // Actually set values to blackboard
-        if (!setValues(0, configurationAccessContext.getBaseOffset(), xmlConfigurableElementSettingsElement.getTextContent(), configurationAccessContext)) {
+        if (!setValues(0, configurationAccessContext.getBaseOffset(), xmlConfigurationSettingsElementContent.getTextContent(), configurationAccessContext)) {
 
             return false;
         }
@@ -70,7 +70,7 @@
         getValues(configurationAccessContext.getBaseOffset(), strValue, configurationAccessContext);
 
         // Populate value into xml text node
-        xmlConfigurableElementSettingsElement.setTextContent(strValue);
+        xmlConfigurationSettingsElementContent.setTextContent(strValue);
     }
 
     // Done
@@ -220,7 +220,7 @@
 bool CArrayParameter::setValues(uint32_t uiStartIndex, uint32_t uiBaseOffset, const string& strValue, CParameterAccessContext& parameterContext) const
 {
     // Deal with value(s)
-    Tokenizer tok(strValue);
+    Tokenizer tok(strValue, DEFAULT_DELIMITER + ",");
 
     vector<string> astrValues = tok.split();
     uint32_t uiNbValues = astrValues.size();
@@ -261,12 +261,22 @@
     uint32_t uiSize = getSize();
     uint32_t uiOffset = getOffset() - uiBaseOffset;
 
+    bool bFirst = true;
+
     for (uiValueIndex = 0; uiValueIndex < _uiLength; uiValueIndex++) {
         string strReadValue;
 
         doGetValue(strReadValue, uiOffset, parameterContext);
 
-        strValues += strReadValue + " ";
+        if (!bFirst) {
+
+            strValues += " ";
+        } else {
+
+            bFirst = false;
+        }
+
+        strValues += strReadValue;
 
         uiOffset += uiSize;
     }