diff options
| author | Frederic Boisnard <fredericx.boisnard@intel.com> | 2012-03-30 10:45:01 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:03:10 +0100 |
| commit | a2a91058deb15b21baed892e2e27cb2d49e824ed (patch) | |
| tree | 0cde00ddcfc87c6fd7168c4178c89967ac60032f /Schemas | |
| parent | 95f907a0521b67d7efdfdee8d4f6047d8cb23cdd (diff) | |
| download | external_parameter-framework-a2a91058deb15b21baed892e2e27cb2d49e824ed.zip external_parameter-framework-a2a91058deb15b21baed892e2e27cb2d49e824ed.tar.gz external_parameter-framework-a2a91058deb15b21baed892e2e27cb2d49e824ed.tar.bz2 | |
PFW: Allow multiple 0 in XML array parameters
BZ: 29913
Updated the patterns of the ParameterSettings.xsd in order to allow
multiple 0 in arrays.
Updated the ParameterSettings.xsd concerning the FixedPointParameters:
- Enabled trailing zeros,
- Enabled negative values,
- Enabled 0 in fixed point arrays,
- Disabled trailing whitespace in hexa values,
- Enabled scientific notation in fixed points
Signed-off-by: Frederic Boisnard <fredericx.boisnard@intel.com>
Change-Id: I1cf4223587a650efbd05d674e96ebd6c40d46927
Reviewed-on: http://android.intel.com:8080/41892
Reviewed-by: Boisnard, FredericX <fredericx.boisnard@intel.com>
Reviewed-by: Benavoli, Patrick <patrick.benavoli@intel.com>
Reviewed-by: Wagner, DavidX <davidx.wagner@intel.com>
Reviewed-by: De Chivre, Renaud <renaud.de.chivre@intel.com>
Tested-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'Schemas')
| -rw-r--r-- | Schemas/ParameterSettings.xsd | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Schemas/ParameterSettings.xsd b/Schemas/ParameterSettings.xsd index d0a14fe..1e346b2 100644 --- a/Schemas/ParameterSettings.xsd +++ b/Schemas/ParameterSettings.xsd @@ -27,8 +27,8 @@ <xs:complexType name="IntegerParameterType">
<xs:simpleContent>
<xs:restriction base="ParameterType">
- <xs:pattern value="(0|[+-]?[1-9][0-9]*[\s]*)+"/>
- <xs:pattern value="(0x[0-9a-fA-F]+\s*)+"/>
+ <xs:pattern value="(0|([+-]?[1-9][0-9]*))(\s+(0|([+-]?[1-9][0-9]*)))*"/>
+ <xs:pattern value="(0x[0-9a-fA-F]+)(\s+(0x[0-9a-fA-F]+))*"/>
<xs:attribute name="ValueSpace" use="prohibited"/>
</xs:restriction>
</xs:simpleContent>
@@ -43,9 +43,8 @@ <xs:complexType name="FixedPointParameterType">
<xs:simpleContent>
<xs:restriction base="ParameterType">
- <xs:pattern value="((0|[+-]?[1-9][0-9]*)\s*)+"/>
- <xs:pattern value="(0\.0|[+-]?([1-9][0-9]*|0)(\.[0-9]+)?\s*)+"/>
- <xs:pattern value="(0x[0-9a-fA-F]+\s*)+"/>
+ <xs:pattern value="((0|[+-]?0\.[0-9]+|(([+-]?[1-9][0-9]*)(\.[0-9]+)?))(e[+-]?[0-9]+)?)(\s+(0|[+-]?0\.[0-9]+|(([+-]?[1-9][0-9]*)(\.[0-9]+)?))(e[+-]?[0-9]+)?)*"/>
+ <xs:pattern value="(0x[0-9a-fA-F]+)(\s+(0x[0-9a-fA-F]+))*"/>
</xs:restriction>
</xs:simpleContent>
</xs:complexType>
|