Rework getAttribute API

getAttribute API forces the user to call a specific
API for each call getAttributeString etc..
This patch replaces this API by a template one.
The success of of the action can now be checked.
It can be useful one to check that a conversion succeed.

Signed-off-by: Jules Clero <[email protected]>

Author: clero

parameter/BitParameterBlockType.cpp

@@ -59,7 +59,8 @@ uint32_t CBitParameterBlockType::getSize() const
 bool CBitParameterBlockType::fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext)
 {
     // Size
-    _uiSize = xmlElement.getAttributeInteger("Size") / 8;
+    xmlElement.getAttribute("Size", _uiSize);
+    _uiSize /= 8;
 
     // Base
     return base::fromXml(xmlElement, serializingContext);
@@ -75,7 +76,7 @@ CInstanceConfigurableElement* CBitParameterBlockType::doInstantiate() const
 void CBitParameterBlockType::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Size
-    xmlElement.setAttributeString("Size", CUtility::toString(_uiSize * 8));
+    xmlElement.setAttribute("Size", CUtility::toString(_uiSize * 8));
 
     base::toXml(xmlElement, serializingContext);
 }

parameter/BitParameterType.cpp

@@ -74,10 +74,10 @@ void CBitParameterType::showProperties(string& strResult) const
 bool CBitParameterType::fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext)
 {
     // Pos
-    _uiBitPos = xmlElement.getAttributeInteger("Pos");
+    xmlElement.getAttribute("Pos", _uiBitPos);
 
     // Size
-    _uiBitSize = xmlElement.getAttributeInteger("Size");
+    xmlElement.getAttribute("Size", _uiBitSize);
 
     // Validate bit pos and size still fit into parent type
     const CBitParameterBlockType* pBitParameterBlockType = static_cast<const CBitParameterBlockType*>(getParent());
@@ -99,7 +99,7 @@ bool CBitParameterType::fromXml(const CXmlElement& xmlElement, CXmlSerializingCo
     // Max
     if (xmlElement.hasAttribute("Max")) {
 
-        _uiMax = xmlElement.getAttributeInteger("Max");
+        xmlElement.getAttribute("Max", _uiMax);
 
         if (_uiMax > getMaxEncodableValue()) {
 
@@ -246,13 +246,13 @@ bool CBitParameterType::isEncodable(uint64_t uiData) const
 void CBitParameterType::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Position
-    xmlElement.setAttributeString("Pos", CUtility::toString(_uiBitPos));
+    xmlElement.setAttribute("Pos", _uiBitPos);
 
     // Size
-    xmlElement.setAttributeString("Size", CUtility::toString(_uiBitSize));
+    xmlElement.setAttribute("Size", _uiBitSize);
 
     // Maximum
-    xmlElement.setAttributeString("Max", CUtility::toString(_uiMax));
+    xmlElement.setAttribute("Max", _uiMax);
 
     base::toXml(xmlElement, serializingContext);
 

parameter/ComponentInstance.cpp

@@ -80,7 +80,8 @@ bool CComponentInstance::fromXml(const CXmlElement& xmlElement, CXmlSerializingC
 
     const CComponentLibrary* pComponentLibrary = parameterBuildContext.getComponentLibrary();
 
-    std::string strComponentType = xmlElement.getAttributeString("Type");
+    std::string strComponentType;
+    xmlElement.getAttribute("Type", strComponentType);
 
     _pComponentType = pComponentLibrary->getComponentType(strComponentType);
 

parameter/ComponentType.cpp

@@ -89,7 +89,8 @@ bool CComponentType::fromXml(const CXmlElement& xmlElement, CXmlSerializingConte
     // Check for Extends attribute (extensions will be populated after and not before)
     if (xmlElement.hasAttribute("Extends")) {
 
-        std::string strExtendsType = xmlElement.getAttributeString("Extends");
+        std::string strExtendsType;
+        xmlElement.getAttribute("Extends", strExtendsType);
 
         _pExtendsComponentType = pComponentLibrary->getComponentType(strExtendsType);
 

parameter/CompoundRule.cpp

@@ -150,7 +150,7 @@ bool CCompoundRule::fromXml(const CXmlElement& xmlElement, CXmlSerializingContex
 void CCompoundRule::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Set type
-    xmlElement.setAttributeString("Type", _apcTypes[_bTypeAll]);
+    xmlElement.setAttribute("Type", _apcTypes[_bTypeAll]);
 
     // Base
     base::toXml(xmlElement, serializingContext);

parameter/ConfigurableDomain.cpp

@@ -120,7 +120,7 @@ void CConfigurableDomain::toXml(CXmlElement& xmlElement, CXmlSerializingContext&
     base::toXml(xmlElement, serializingContext);
 
     // Sequence awareness
-    xmlElement.setAttributeBoolean("SequenceAware", _bSequenceAware);
+    xmlElement.setAttribute("SequenceAware", _bSequenceAware);
 }
 
 void CConfigurableDomain::childrenToXml(CXmlElement& xmlElement,
@@ -168,7 +168,7 @@ void CConfigurableDomain::composeConfigurableElements(CXmlElement& xmlElement) c
         xmlConfigurableElementsElement.createChild(xmlChildConfigurableElement, "ConfigurableElement");
 
         // Set Path attribute
-        xmlChildConfigurableElement.setAttributeString("Path", pConfigurableElement->getPath());
+        xmlChildConfigurableElement.setAttribute("Path", pConfigurableElement->getPath());
     }
 }
 
@@ -217,9 +217,11 @@ bool CConfigurableDomain::fromXml(const CXmlElement& xmlElement, CXmlSerializing
         static_cast<CXmlDomainImportContext&>(serializingContext);
 
     // Sequence awareness (optional)
-    _bSequenceAware = xmlElement.hasAttribute("SequenceAware") && xmlElement.getAttributeBoolean("SequenceAware");
+    xmlElement.getAttribute("SequenceAware", _bSequenceAware);
 
-    setName(xmlElement.getAttributeString("Name"));
+    std::string name;
+    xmlElement.getAttribute("Name", name);
+    setName(name);
 
     // Local parsing. Do not dig
     if (!parseDomainConfigurations(xmlElement, xmlDomainImportContext) ||
@@ -273,7 +275,8 @@ bool CConfigurableDomain::parseConfigurableElements(const CXmlElement& xmlElemen
     while (it.next(xmlConfigurableElementElement)) {
 
         // Locate configurable element
-        string strConfigurableElementPath = xmlConfigurableElementElement.getAttributeString("Path");
+        string strConfigurableElementPath;
+        xmlConfigurableElementElement.getAttribute("Path", strConfigurableElementPath);
 
         CPathNavigator pathNavigator(strConfigurableElementPath);
         string strError;

parameter/ConfigurableDomains.cpp

@@ -111,7 +111,7 @@ void CConfigurableDomains::apply(CParameterBlackboard* pParameterBlackboard,
 void CConfigurableDomains::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Set attribute
-    xmlElement.setAttributeString("SystemClassName", getName());
+    xmlElement.setAttribute("SystemClassName", getName());
 
     base::childrenToXml(xmlElement, serializingContext);
 }

parameter/DomainConfiguration.cpp

@@ -86,7 +86,8 @@ bool CDomainConfiguration::parseSettings(CXmlElement& xmlConfigurationSettingsEl
     while (it.next(xmlConfigurableElementSettingsElement)) {
 
         // Retrieve area configuration
-        string strConfigurableElementPath = xmlConfigurableElementSettingsElement.getAttributeString("Path");
+        string strConfigurableElementPath;
+        xmlConfigurableElementSettingsElement.getAttribute("Path", strConfigurableElementPath);
 
         CAreaConfiguration* pAreaConfiguration = findAreaConfiguration(strConfigurableElementPath);
 
@@ -131,7 +132,7 @@ void CDomainConfiguration::composeSettings(CXmlElement& xmlConfigurationSettings
         xmlConfigurationSettingsElement.createChild(xmlConfigurableElementSettingsElement, "ConfigurableElement");
 
         // Set Path attribute
-        xmlConfigurableElementSettingsElement.setAttributeString("Path", pConfigurableElement->getPath());
+        xmlConfigurableElementSettingsElement.setAttribute("Path", pConfigurableElement->getPath());
 
         // Delegate composing to area configuration
         ((CDomainConfiguration&)(*this)).serializeConfigurableElementSettings((CAreaConfiguration*)pAreaConfiguration, xmlConfigurableElementSettingsElement, serializingContext, true);

parameter/EnumParameterType.cpp

@@ -82,7 +82,8 @@ void CEnumParameterType::showProperties(string& strResult) const
 bool CEnumParameterType::fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext)
 {
     // Size in bits
-    uint32_t uiSizeInBits = xmlElement.getAttributeInteger("Size");
+    uint32_t uiSizeInBits;
+    xmlElement.getAttribute("Size", uiSizeInBits);
 
     // Size
     setSize(uiSizeInBits / 8);
@@ -345,7 +346,7 @@ bool CEnumParameterType::isValid(int iNumerical, CParameterAccessContext& parame
 void CEnumParameterType::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Size
-    xmlElement.setAttributeString("Size", CUtility::toString(getSize() * 8));
+    xmlElement.setAttribute("Size", getSize() * 8);
 
     base::toXml(xmlElement, serializingContext);
 }

parameter/EnumValuePair.cpp

@@ -59,10 +59,12 @@ string CEnumValuePair::getNumericalAsString() const
 bool CEnumValuePair::fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext)
 {
     // Literal
-    setName(xmlElement.getAttributeString("Literal"));
+    std::string name;
+    xmlElement.getAttribute("Literal", name);
+    setName(name);
 
     // Numerical
-    _iNumerical = xmlElement.getAttributeSignedInteger("Numerical");
+    xmlElement.getAttribute("Numerical", _iNumerical);
 
     // Base
     return base::fromXml(xmlElement, serializingContext);
@@ -80,10 +82,10 @@ void CEnumValuePair::logValue(string& strValue, CErrorContext& errorContext) con
 void CEnumValuePair::toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const
 {
     // Literal
-    xmlElement.setAttributeString("Literal", this->getName());
+    xmlElement.setAttribute("Literal", this->getName());
 
     // Numerical
-    xmlElement.setAttributeString("Numerical", getNumericalAsString());
+    xmlElement.setAttribute("Numerical", getNumericalAsString());
 
     base::toXml(xmlElement, serializingContext);
 }