diff options
Diffstat (limited to 'src/WixToolset.Data/IntermediateTuple.cs')
-rw-r--r-- | src/WixToolset.Data/IntermediateTuple.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WixToolset.Data/IntermediateTuple.cs b/src/WixToolset.Data/IntermediateTuple.cs index 0f1e5965..cda133b5 100644 --- a/src/WixToolset.Data/IntermediateTuple.cs +++ b/src/WixToolset.Data/IntermediateTuple.cs | |||
@@ -6,9 +6,9 @@ namespace WixToolset.Data | |||
6 | 6 | ||
7 | public class IntermediateTuple | 7 | public class IntermediateTuple |
8 | { | 8 | { |
9 | //public IntermediateTuple(IntermediateTupleDefinition definition) : this(definition, null, null) | 9 | public IntermediateTuple(IntermediateTupleDefinition definition) : this(definition, null, null) |
10 | //{ | 10 | { |
11 | //} | 11 | } |
12 | 12 | ||
13 | public IntermediateTuple(IntermediateTupleDefinition definition, SourceLineNumber sourceLineNumber, Identifier id = null) | 13 | public IntermediateTuple(IntermediateTupleDefinition definition, SourceLineNumber sourceLineNumber, Identifier id = null) |
14 | { | 14 | { |
@@ -35,11 +35,11 @@ namespace WixToolset.Data | |||
35 | var sourceLineNumbersJson = jsonObject.GetValueOrDefault<JsonObject>("ln"); | 35 | var sourceLineNumbersJson = jsonObject.GetValueOrDefault<JsonObject>("ln"); |
36 | var fieldsJson = jsonObject.GetValueOrDefault<JsonArray>("fields"); | 36 | var fieldsJson = jsonObject.GetValueOrDefault<JsonArray>("fields"); |
37 | 37 | ||
38 | creator.TryGetTupleDefinitionByName(definitionName, out var definition); // TODO: this isn't sufficient. | 38 | var id = (idJson == null) ? null : Identifier.Deserialize(idJson); |
39 | var tuple = definition.CreateTuple(); | 39 | var sourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson); |
40 | 40 | ||
41 | tuple.Id = (idJson == null) ? null : Identifier.Deserialize(idJson); | 41 | creator.TryGetTupleDefinitionByName(definitionName, out var definition); // TODO: this isn't sufficient. |
42 | tuple.SourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson); | 42 | var tuple = definition.CreateTuple(sourceLineNumbers, id); |
43 | 43 | ||
44 | for (var i = 0; i < fieldsJson.Count; ++i) | 44 | for (var i = 0; i < fieldsJson.Count; ++i) |
45 | { | 45 | { |