Prevented json array of numbers appending on merge 09/56809/8
authorDavid Steele <david.steele@samsung.com>
Tue, 12 Jan 2016 17:37:42 +0000 (17:37 +0000)
committerDavid Steele <david.steele@samsung.com>
Thu, 21 Jan 2016 11:41:33 +0000 (11:41 +0000)
commit4ff601968ee16e6d401977900d2aed328bdc6707
tree22a7b707722df3a0aaf6a91d5f02e8233452e7dc
parent2f5d4ba8f28af430695ea2a6692fb3d11310af99
Prevented json array of numbers appending on merge

If 2 JSON files are merged into the same JSON parser (by calling Parse(first) then
calling Parse(second) ), then currently, nodes in the tree with the same
key but with differing types are overridden, but object and array
types are merged.

This is problematic for styling, where colors are represented as JSON arrays.

Changed matching arrays of numbers to override rather than merge.

Change-Id: Ia7a37a16919aa8648e7fe34430c5abf04cfaddb4
Signed-off-by: David Steele <david.steele@partner.samsung.com>
automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
dali-toolkit/internal/builder/builder-impl.cpp
dali-toolkit/internal/builder/json-parser-state.cpp
dali-toolkit/internal/builder/tree-node-manipulator.cpp
dali-toolkit/internal/styling/style-manager-impl.cpp
dali-toolkit/internal/styling/style-manager-impl.h
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json