From 9787570331b511bab73ac8f4f38a3b8cfa053ca5 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 24 Jun 2020 14:05:08 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/WixToolset.Data/IntermediateSection.cs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/WixToolset.Data/IntermediateSection.cs') 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 this.Id = id; this.Type = type; this.Codepage = codepage; - this.Tuples = new List(); + this.Symbols = new List(); } /// @@ -54,14 +54,14 @@ namespace WixToolset.Data public string LibraryId { get; set; } /// - /// Tuples in the section. + /// Symbols in the section. /// - public IList Tuples { get; } + public IList Symbols { get; } /// /// Parse a section from the JSON data. /// - internal static IntermediateSection Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) + internal static IntermediateSection Deserialize(ISymbolDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) { var codepage = jsonObject.GetValueOrDefault("codepage", 0); var id = jsonObject.GetValueOrDefault("id"); @@ -74,12 +74,12 @@ namespace WixToolset.Data var section = new IntermediateSection(id, type, codepage); - var tuplesJson = jsonObject.GetValueOrDefault("tuples"); + var symbolsJson = jsonObject.GetValueOrDefault("symbols"); - foreach (JsonObject tupleJson in tuplesJson) + foreach (JsonObject symbolJson in symbolsJson) { - var tuple = IntermediateTuple.Deserialize(creator, baseUri, tupleJson); - section.Tuples.Add(tuple); + var symbol = IntermediateSymbol.Deserialize(creator, baseUri, symbolJson); + section.Symbols.Add(symbol); } return section; @@ -98,15 +98,15 @@ namespace WixToolset.Data jsonObject.Add("id", this.Id); } - var tuplesJson = new JsonArray(this.Tuples.Count); + var symbolsJson = new JsonArray(this.Symbols.Count); - foreach (var tuple in this.Tuples) + foreach (var symbol in this.Symbols) { - var tupleJson = tuple.Serialize(); - tuplesJson.Add(tupleJson); + var symbolJson = symbol.Serialize(); + symbolsJson.Add(symbolJson); } - jsonObject.Add("tuples", tuplesJson); + jsonObject.Add("symbols", symbolsJson); return jsonObject; } -- cgit v1.2.3-55-g6feb