Small fixes to tuples
Rob Mensching committed
Oct 18, 2019 at 11:28 UTC
cf6531a216dc248177116399120f02d67731f312
3 files changed
+33
-40
src/WixToolset.Data/IntermediateTupleExtensions.cs
+5
-20
@@ -16,11 +16,6 @@ namespace WixToolset.Data
16
17
public static IntermediateField Set(this IntermediateTuple tuple, int index, bool value)
18
{
19
- if (value == default && NoFieldMetadata(tuple, index))
20
- {
21
- return tuple.Fields[index] = null;
22
- }
23
-
19
var definition = tuple.Definition.FieldDefinitions[index];
20
21
var field = tuple.Fields[index].Set(definition, value);
@@ -30,7 +25,7 @@ namespace WixToolset.Data
25
26
public static IntermediateField Set(this IntermediateTuple tuple, int index, bool? value)
27
{
33
- if (value == default && NoFieldMetadata(tuple, index))
28
+ if (value == null && NoFieldMetadata(tuple, index))
29
{
30
return tuple.Fields[index] = null;
31
}
@@ -44,11 +39,6 @@ namespace WixToolset.Data
39
40
public static IntermediateField Set(this IntermediateTuple tuple, int index, long value)
41
{
47
- if (value == default && NoFieldMetadata(tuple, index))
48
- {
49
- return tuple.Fields[index] = null;
50
- }
51
-
42
var definition = tuple.Definition.FieldDefinitions[index];
43
44
var field = tuple.Fields[index].Set(definition, value);
@@ -58,7 +48,7 @@ namespace WixToolset.Data
48
49
public static IntermediateField Set(this IntermediateTuple tuple, int index, long? value)
50
{
61
- if (value == default && NoFieldMetadata(tuple, index))
51
+ if (value == null && NoFieldMetadata(tuple, index))
52
{
53
return tuple.Fields[index] = null;
54
}
@@ -72,11 +62,6 @@ namespace WixToolset.Data
62
63
public static IntermediateField Set(this IntermediateTuple tuple, int index, int value)
64
{
75
- if (value == default && NoFieldMetadata(tuple, index))
76
- {
77
- return tuple.Fields[index] = null;
78
- }
79
-
65
var definition = tuple.Definition.FieldDefinitions[index];
66
67
var field = tuple.Fields[index].Set(definition, value);
@@ -86,7 +71,7 @@ namespace WixToolset.Data
71
72
public static IntermediateField Set(this IntermediateTuple tuple, int index, int? value)
73
{
89
- if (value == default && NoFieldMetadata(tuple, index))
74
+ if (value == null && NoFieldMetadata(tuple, index))
75
{
76
return tuple.Fields[index] = null;
77
}
@@ -100,7 +85,7 @@ namespace WixToolset.Data
85
86
public static IntermediateField Set(this IntermediateTuple tuple, int index, IntermediateFieldPathValue value)
87
{
103
- if (value == default && NoFieldMetadata(tuple, index))
88
+ if (value == null && NoFieldMetadata(tuple, index))
89
{
90
return tuple.Fields[index] = null;
91
}
@@ -114,7 +99,7 @@ namespace WixToolset.Data
99
100
public static IntermediateField Set(this IntermediateTuple tuple, int index, string value)
101
{
117
- if (value == default && NoFieldMetadata(tuple, index))
102
+ if (value == null && NoFieldMetadata(tuple, index))
103
{
104
return tuple.Fields[index] = null;
105
}
src/WixToolset.Data/Tuples/ClassTuple.cs
+2
-2
@@ -107,9 +107,9 @@ namespace WixToolset.Data.Tuples
107
set => this.Set((int)ClassTupleFields.IconRef, value);
108
}
109
110
- public int IconIndex
110
+ public int? IconIndex
111
{
112
- get => (int)this.Fields[(int)ClassTupleFields.IconIndex];
112
+ get => (int?)this.Fields[(int)ClassTupleFields.IconIndex];
113
set => this.Set((int)ClassTupleFields.IconIndex, value);
114
}
115
src/WixToolset.Data/Tuples/TextStyleTuple.cs
+26
-18
@@ -10,10 +10,11 @@ namespace WixToolset.Data
10
TupleDefinitionType.TextStyle,
11
new[]
12
{
13
- new IntermediateFieldDefinition(nameof(TextStyleTupleFields.TextStyle), IntermediateFieldType.String),
13
new IntermediateFieldDefinition(nameof(TextStyleTupleFields.FaceName), IntermediateFieldType.String),
14
new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Size), IntermediateFieldType.Number),
16
- new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Color), IntermediateFieldType.Number),
15
+ new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Red), IntermediateFieldType.Number),
16
+ new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Green), IntermediateFieldType.Number),
17
+ new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Blue), IntermediateFieldType.Number),
18
new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Bold), IntermediateFieldType.Bool),
19
new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Italic), IntermediateFieldType.Bool),
20
new IntermediateFieldDefinition(nameof(TextStyleTupleFields.Strike), IntermediateFieldType.Bool),
@@ -27,10 +28,11 @@ namespace WixToolset.Data.Tuples
28
{
29
public enum TextStyleTupleFields
30
{
30
- TextStyle,
31
FaceName,
32
Size,
33
- Color,
33
+ Red,
34
+ Green,
35
+ Blue,
36
Bold,
37
Italic,
38
Strike,
@@ -49,12 +51,6 @@ namespace WixToolset.Data.Tuples
51
52
public IntermediateField this[TextStyleTupleFields index] => this.Fields[(int)index];
53
52
- public string TextStyle
53
- {
54
- get => (string)this.Fields[(int)TextStyleTupleFields.TextStyle];
55
- set => this.Set((int)TextStyleTupleFields.TextStyle, value);
56
- }
57
-
54
public string FaceName
55
{
56
get => (string)this.Fields[(int)TextStyleTupleFields.FaceName];
@@ -63,37 +59,49 @@ namespace WixToolset.Data.Tuples
59
60
public int Size
61
{
66
- get => this.Fields[(int)TextStyleTupleFields.Size].AsNumber();
62
+ get => (int)this.Fields[(int)TextStyleTupleFields.Size];
63
set => this.Set((int)TextStyleTupleFields.Size, value);
64
}
65
70
- public int Color
66
+ public int? Red
67
+ {
68
+ get => (int?)this.Fields[(int)TextStyleTupleFields.Red];
69
+ set => this.Set((int)TextStyleTupleFields.Red, value);
70
+ }
71
+
72
+ public int? Green
73
+ {
74
+ get => (int?)this.Fields[(int)TextStyleTupleFields.Green];
75
+ set => this.Set((int)TextStyleTupleFields.Green, value);
76
+ }
77
+
78
+ public int? Blue
79
{
72
- get => (int)this.Fields[(int)TextStyleTupleFields.Color].AsNumber();
73
- set => this.Set((int)TextStyleTupleFields.Color, value);
80
+ get => (int?)this.Fields[(int)TextStyleTupleFields.Blue];
81
+ set => this.Set((int)TextStyleTupleFields.Blue, value);
82
}
83
84
public bool Bold
85
{
78
- get => this.Fields[(int)TextStyleTupleFields.Bold].AsBool();
86
+ get => (bool)this.Fields[(int)TextStyleTupleFields.Bold];
87
set => this.Set((int)TextStyleTupleFields.Bold, value);
88
}
89
90
public bool Italic
91
{
84
- get => this.Fields[(int)TextStyleTupleFields.Italic].AsBool();
92
+ get => (bool)this.Fields[(int)TextStyleTupleFields.Italic];
93
set => this.Set((int)TextStyleTupleFields.Italic, value);
94
}
95
96
public bool Strike
97
{
90
- get => this.Fields[(int)TextStyleTupleFields.Strike].AsBool();
98
+ get => (bool)this.Fields[(int)TextStyleTupleFields.Strike];
99
set => this.Set((int)TextStyleTupleFields.Strike, value);
100
}
101
102
public bool Underline
103
{
96
- get => this.Fields[(int)TextStyleTupleFields.Underline].AsBool();
104
+ get => (bool)this.Fields[(int)TextStyleTupleFields.Underline];
105
set => this.Set((int)TextStyleTupleFields.Underline, value);
106
}
107
}