diff options
Diffstat (limited to '')
-rw-r--r-- | src/WixToolset.Data/IntermediateSection.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/WixToolset.Data/IntermediateSection.cs b/src/WixToolset.Data/IntermediateSection.cs index b46d20ba..cd001d5c 100644 --- a/src/WixToolset.Data/IntermediateSection.cs +++ b/src/WixToolset.Data/IntermediateSection.cs | |||
@@ -22,7 +22,7 @@ namespace WixToolset.Data | |||
22 | this.Id = id; | 22 | this.Id = id; |
23 | this.Type = type; | 23 | this.Type = type; |
24 | this.Codepage = codepage; | 24 | this.Codepage = codepage; |
25 | this.Tuples = new List<IntermediateTuple>(); | 25 | this.Symbols = new List<IntermediateSymbol>(); |
26 | } | 26 | } |
27 | 27 | ||
28 | /// <summary> | 28 | /// <summary> |
@@ -54,14 +54,14 @@ namespace WixToolset.Data | |||
54 | public string LibraryId { get; set; } | 54 | public string LibraryId { get; set; } |
55 | 55 | ||
56 | /// <summary> | 56 | /// <summary> |
57 | /// Tuples in the section. | 57 | /// Symbols in the section. |
58 | /// </summary> | 58 | /// </summary> |
59 | public IList<IntermediateTuple> Tuples { get; } | 59 | public IList<IntermediateSymbol> Symbols { get; } |
60 | 60 | ||
61 | /// <summary> | 61 | /// <summary> |
62 | /// Parse a section from the JSON data. | 62 | /// Parse a section from the JSON data. |
63 | /// </summary> | 63 | /// </summary> |
64 | internal static IntermediateSection Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) | 64 | internal static IntermediateSection Deserialize(ISymbolDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) |
65 | { | 65 | { |
66 | var codepage = jsonObject.GetValueOrDefault("codepage", 0); | 66 | var codepage = jsonObject.GetValueOrDefault("codepage", 0); |
67 | var id = jsonObject.GetValueOrDefault<string>("id"); | 67 | var id = jsonObject.GetValueOrDefault<string>("id"); |
@@ -74,12 +74,12 @@ namespace WixToolset.Data | |||
74 | 74 | ||
75 | var section = new IntermediateSection(id, type, codepage); | 75 | var section = new IntermediateSection(id, type, codepage); |
76 | 76 | ||
77 | var tuplesJson = jsonObject.GetValueOrDefault<JsonArray>("tuples"); | 77 | var symbolsJson = jsonObject.GetValueOrDefault<JsonArray>("symbols"); |
78 | 78 | ||
79 | foreach (JsonObject tupleJson in tuplesJson) | 79 | foreach (JsonObject symbolJson in symbolsJson) |
80 | { | 80 | { |
81 | var tuple = IntermediateTuple.Deserialize(creator, baseUri, tupleJson); | 81 | var symbol = IntermediateSymbol.Deserialize(creator, baseUri, symbolJson); |
82 | section.Tuples.Add(tuple); | 82 | section.Symbols.Add(symbol); |
83 | } | 83 | } |
84 | 84 | ||
85 | return section; | 85 | return section; |
@@ -98,15 +98,15 @@ namespace WixToolset.Data | |||
98 | jsonObject.Add("id", this.Id); | 98 | jsonObject.Add("id", this.Id); |
99 | } | 99 | } |
100 | 100 | ||
101 | var tuplesJson = new JsonArray(this.Tuples.Count); | 101 | var symbolsJson = new JsonArray(this.Symbols.Count); |
102 | 102 | ||
103 | foreach (var tuple in this.Tuples) | 103 | foreach (var symbol in this.Symbols) |
104 | { | 104 | { |
105 | var tupleJson = tuple.Serialize(); | 105 | var symbolJson = symbol.Serialize(); |
106 | tuplesJson.Add(tupleJson); | 106 | symbolsJson.Add(symbolJson); |
107 | } | 107 | } |
108 | 108 | ||
109 | jsonObject.Add("tuples", tuplesJson); | 109 | jsonObject.Add("symbols", symbolsJson); |
110 | 110 | ||
111 | return jsonObject; | 111 | return jsonObject; |
112 | } | 112 | } |