Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
jeffery.thompson
2017-07-18 10:01:55 -04:00
3 changed files with 36 additions and 5 deletions

View File

@@ -115,6 +115,16 @@ namespace ICD.Common.Utils
return string.Join("", strings);
}
/// <summary>
/// Uses String.Format to properly handle null values.
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public static string ToString(object value)
{
return string.Format("{0}", value);
}
/// <summary>
/// Converts bytes to an ascii string.
/// </summary>
@@ -360,7 +370,7 @@ namespace ICD.Common.Utils
if (items == null)
throw new ArgumentNullException("items");
return string.Format("[{0}]", string.Join(", ", items.Select(i => i.ToString()).ToArray()));
return string.Format("[{0}]", string.Join(", ", items.Select(i => ToString(i)).ToArray()));
}
/// <summary>
@@ -377,7 +387,7 @@ namespace ICD.Common.Utils
string[] ranges = MathUtils.GetRanges(items)
.Select(r => r[0] == r[1]
? r[0].ToString()
? ToString(r[0])
: string.Format("{0}-{1}", r[0], r[1]))
.ToArray();