From a96d1a916bfcf35f77d48f70215d62b298bfb933 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 1 Mar 2021 23:13:11 -0800 Subject: Small cleanup --- src/WixToolset.Data/IntermediateFieldExtensions.cs | 48 ++-------------------- 1 file changed, 3 insertions(+), 45 deletions(-) (limited to 'src/WixToolset.Data/IntermediateFieldExtensions.cs') diff --git a/src/WixToolset.Data/IntermediateFieldExtensions.cs b/src/WixToolset.Data/IntermediateFieldExtensions.cs index 2c856e65..c70eb230 100644 --- a/src/WixToolset.Data/IntermediateFieldExtensions.cs +++ b/src/WixToolset.Data/IntermediateFieldExtensions.cs @@ -45,21 +45,7 @@ namespace WixToolset.Data return null; } - switch (field.Definition.Type) - { - case IntermediateFieldType.Bool: - return field.Value.AsBool(); - - case IntermediateFieldType.LargeNumber: - case IntermediateFieldType.Number: - return field.Value.AsLargeNumber() != 0; - - case IntermediateFieldType.String: - return !String.IsNullOrEmpty(field.Value.AsString()); - - default: - throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to boolean"); - } + return field.AsBool(); } public static long AsLargeNumber(this IntermediateField field) @@ -93,21 +79,7 @@ namespace WixToolset.Data return null; } - switch (field.Definition.Type) - { - case IntermediateFieldType.Bool: - return field.Value.AsBool() ? 1 : 0; - - case IntermediateFieldType.LargeNumber: - case IntermediateFieldType.Number: - return field.Value.AsLargeNumber(); - - case IntermediateFieldType.String: - return Convert.ToInt64(field.Value.AsString()); - - default: - throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to large number"); - } + return field.AsLargeNumber(); } public static int AsNumber(this IntermediateField field) @@ -141,21 +113,7 @@ namespace WixToolset.Data return null; } - switch (field.Definition.Type) - { - case IntermediateFieldType.Bool: - return field.Value.AsBool() ? 1 : 0; - - case IntermediateFieldType.LargeNumber: - case IntermediateFieldType.Number: - return field.Value.AsNumber(); - - case IntermediateFieldType.String: - return Convert.ToInt32(field.Value.AsString()); - - default: - throw new InvalidCastException($"Cannot convert field {field.Name} with type {field.Type} to number"); - } + return field.AsNumber(); } public static IntermediateFieldPathValue AsPath(this IntermediateField field) -- cgit v1.2.3-55-g6feb