diff options
author | Patrick Benavoli <patrickx.benavoli@intel.com> | 2011-11-29 11:10:27 +0100 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-02-10 17:15:01 +0100 |
commit | 0bd50546a8d06a6865d32c695adf8893fa71250a (patch) | |
tree | 966dc5c4c8143df983668db92db26129eafb1e3b /parameter/ConfigurableDomain.h | |
parent | e7a903ef0a5ee2b9d51e6f86d32c704b9ff16c21 (diff) | |
download | external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.zip external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.tar.gz external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.tar.bz2 |
PFW: Rule handling from CLI
BZ: 15689
These changes enable handling changing the rules for configuration application
from the command line interface.
It is possible to assign a new rule, to display the existing one or to clear
it.
Restriction: like in XML, root rule must be compound.
Syntax is the following:
- Criterion rule expression:
<criterion> <verb> <object>
- Compound rule expression
(All|Any){<content>}
where <content> is a comma separated list of any kind of rules.
Example:
All{Any{SelectedOutputDevice Includes Headphones, SelectedOutputDevice
Includes Headset}, Any{Mode Is Normal, Mode Is RingTone}}
means the pertaining configuration will be applied when Selected device
includes either Headphones or Headset, while, ate the same time, Mode is
either Normal or RingTone.
Added dumpDomains remote command to show a summary of domains, configurations
as well as their application conditions (tree view).
Removed not anymore necessary guard against deletion of domains or
configurations that contain rules, ad now they're controlled from the CLI.
Change-Id: Iad2c183271b077b8bbc8ac2fc5f37c266004070f
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/26100
Reviewed-by: De Chivre, RenaudX <renaudx.de.chivre@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/ConfigurableDomain.h')
-rw-r--r-- | parameter/ConfigurableDomain.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/parameter/ConfigurableDomain.h b/parameter/ConfigurableDomain.h index 87ed41c..ac3c5c9 100644 --- a/parameter/ConfigurableDomain.h +++ b/parameter/ConfigurableDomain.h @@ -39,6 +39,7 @@ class CConfigurableElement; class CDomainConfiguration; class CParameterBlackboard; +class CSelectionCriteriaDefinition; class CConfigurableDomain : public CBinarySerializableElement { @@ -56,10 +57,13 @@ public: bool createConfiguration(const string& strName, const CParameterBlackboard* pMainBlackboard, string& strError); bool deleteConfiguration(const string& strName, string& strError); bool renameConfiguration(const string& strName, const string& strNewName, string& strError); - bool restoreConfiguration(const string& strName, CParameterBlackboard* pMainBlackboard, bool bAutoSync, string& strError); + bool restoreConfiguration(const string& strName, CParameterBlackboard* pMainBlackboard, bool bAutoSync, string& strError) const; bool saveConfiguration(const string& strName, const CParameterBlackboard* pMainBlackboard, string& strError); - bool setElementSequence(const string& strName, const vector<string>& astrNewElementSequence, string& strError); - bool getElementSequence(const string& strName, string& strResult) const; + bool setElementSequence(const string& strConfiguration, const vector<string>& astrNewElementSequence, string& strError); + bool getElementSequence(const string& strConfiguration, string& strResult) const; + bool setApplicationRule(const string& strConfiguration, const string& strApplicationRule, const CSelectionCriteriaDefinition* pSelectionCriteriaDefinition, string& strError); + bool clearApplicationRule(const string& strConfiguration, string& strError); + bool getApplicationRule(const string& strConfiguration, string& strResult) const; // Last applied configuration string getLastAppliedConfigurationName() const; @@ -84,9 +88,6 @@ public: // Return applicable configuration validity for given configurable element bool isApplicableConfigurationValid(const CConfigurableElement* pConfigurableElement) const; - // Presence of application condition on any configuration - bool hasRules() const; - // From IXmlSink virtual bool fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext); @@ -95,6 +96,9 @@ public: // Class kind virtual string getKind() const; +protected: + // Content dumping + virtual void logValue(string& strValue, CErrorContext& errorContext) const; private: // Returns true if children dynamic creation is to be dealt with (here, will allow child deletion upon clean) virtual bool childrenAreDynamic() const; @@ -144,6 +148,10 @@ private: // Syncer set retrieval from configurable element CSyncerSet* getSyncerSet(const CConfigurableElement* pConfigurableElement) const; + // Configuration retrieval + CDomainConfiguration* findConfiguration(const string& strConfiguration, string& strError); + const CDomainConfiguration* findConfiguration(const string& strConfiguration, string& strError) const; + // Configurable elements list<CConfigurableElement*> _configurableElementList; |