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/SelectionCriterionRule.h

diff --git a/parameter/SelectionCriterionRule.h b/parameter/SelectionCriterionRule.h
index ebd7611..528e584 100644
--- a/parameter/SelectionCriterionRule.h
+++ b/parameter/SelectionCriterionRule.h
@@ -36,12 +36,21 @@
 
 class CSelectionCriterionRule : public CRule
 {
+    // Matching rules
     enum MatchesWhen {
         EIs,
-        EContains,
+        EIsNot,
+        EIncludes,
+        EExcludes,
 
         ENbMatchesWhen
     };
+    // Matching rule description
+    struct SMatchingRuleDescription
+    {
+        const char* pcMatchesWhen;
+        bool bInclusiveTypeCompatible;
+    };
 
 public:
     CSelectionCriterionRule();
@@ -58,12 +67,12 @@
     // Class kind
     virtual string getKind() const;
 private:
+    // XML MatchesWhen attribute parsing
+    bool setMatchesWhen(const string& strMatchesWhen, string& strError);
+
     // Selection criterion
     const CSelectionCriterion* _pSelectionCriterion;
 
-    // XML MatchesWhen attribute parsing
-    bool setMatchesWhen(const string& strMatchesWhen);
-
     // MatchesWhen
     MatchesWhen _eMatchesWhen;
 
@@ -71,6 +80,6 @@
     int32_t _iMatchValue;
 
     // Used for XML MatchesWhen attribute parsing
-    static const char* _apcMatchesWhen[ENbMatchesWhen];
+    static SMatchingRuleDescription _astMatchesWhen[ENbMatchesWhen];
 };