Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to string interpolation and inlined out var definition

Browse Source
This commit is contained in:
nopjmp
2019-10-26 15:59:02 -05:00
parent 7a4588e65a
commit 5212d3aa99
1 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
LibreMetaverse.StructuredData/LLSD/XmlLLSD.cs
View File

@@ -40,7 +40,7 @@ namespace OpenMetaverse.StructuredData
{
private static XmlSchema XmlSchema;
private static XmlTextReader XmlTextReader;
private static string LastXmlErrors = String.Empty;
private static string LastXmlErrors = string.Empty;
private static object XmlValidationLock = new object();
/// <summary>
@@ -117,7 +117,7 @@ namespace OpenMetaverse.StructuredData
{
writer.Formatting = Formatting.None;
writer.WriteStartElement(String.Empty, "llsd", String.Empty);
writer.WriteStartElement(string.Empty, "llsd", string.Empty);
SerializeLLSDXmlElement(writer, data);
writer.WriteEndElement();
@@ -148,47 +148,47 @@ namespace OpenMetaverse.StructuredData
switch (data.Type)
{
case OSDType.Unknown:
writer.WriteStartElement(String.Empty, "undef", String.Empty);
writer.WriteStartElement(string.Empty, "undef", string.Empty);
writer.WriteEndElement();
break;
case OSDType.Boolean:
writer.WriteStartElement(String.Empty, "boolean", String.Empty);
writer.WriteStartElement(string.Empty, "boolean", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.Integer:
writer.WriteStartElement(String.Empty, "integer", String.Empty);
writer.WriteStartElement(string.Empty, "integer", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.Real:
writer.WriteStartElement(String.Empty, "real", String.Empty);
writer.WriteStartElement(string.Empty, "real", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.String:
writer.WriteStartElement(String.Empty, "string", String.Empty);
writer.WriteStartElement(string.Empty, "string", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.UUID:
writer.WriteStartElement(String.Empty, "uuid", String.Empty);
writer.WriteStartElement(string.Empty, "uuid", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.Date:
writer.WriteStartElement(String.Empty, "date", String.Empty);
writer.WriteStartElement(string.Empty, "date", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.URI:
writer.WriteStartElement(String.Empty, "uri", String.Empty);
writer.WriteStartElement(string.Empty, "uri", string.Empty);
writer.WriteString(data.AsString());
writer.WriteEndElement();
break;
case OSDType.Binary:
writer.WriteStartElement(String.Empty, "binary", String.Empty);
writer.WriteStartAttribute(String.Empty, "encoding", String.Empty);
writer.WriteStartElement(string.Empty, "binary", string.Empty);
writer.WriteStartAttribute(string.Empty, "encoding", string.Empty);
writer.WriteString("base64");
writer.WriteEndAttribute();
writer.WriteString(data.AsString());
@@ -196,10 +196,10 @@ namespace OpenMetaverse.StructuredData
break;
case OSDType.Map:
OSDMap map = (OSDMap)data;
writer.WriteStartElement(String.Empty, "map", String.Empty);
writer.WriteStartElement(string.Empty, "map", string.Empty);
foreach (KeyValuePair<string, OSD> kvp in map)
{
writer.WriteStartElement(String.Empty, "key", String.Empty);
writer.WriteStartElement(string.Empty, "key", string.Empty);
writer.WriteString(kvp.Key);
writer.WriteEndElement();
@@ -209,7 +209,7 @@ namespace OpenMetaverse.StructuredData
break;
case OSDType.Array:
OSDArray array = (OSDArray)data;
writer.WriteStartElement(String.Empty, "array", String.Empty);
writer.WriteStartElement(string.Empty, "array", string.Empty);
foreach (var element in array)
{
SerializeLLSDXmlElement(writer, element);
@@ -234,7 +234,7 @@ namespace OpenMetaverse.StructuredData
{
lock (XmlValidationLock)
{
LastXmlErrors = String.Empty;
LastXmlErrors = string.Empty;
XmlTextReader = xmlData;
CreateLLSDXmlSchema();
@@ -257,7 +257,7 @@ namespace OpenMetaverse.StructuredData
return false;
}
if (LastXmlErrors == String.Empty)
if (LastXmlErrors == string.Empty)
{
error = null;
return true;
@@ -310,7 +310,7 @@ namespace OpenMetaverse.StructuredData
{
string s = reader.ReadString().Trim();
if (!String.IsNullOrEmpty(s) && (s == "true" || s == "1"))
if (!string.IsNullOrEmpty(s) && (s == "true" || s == "1"))
{
ret = OSD.FromBoolean(true);
break;
@@ -328,8 +328,7 @@ namespace OpenMetaverse.StructuredData
if (reader.Read())
{
int value = 0;
Int32.TryParse(reader.ReadString().Trim(), out value);
int.TryParse(reader.ReadString().Trim(), out var value);
ret = OSD.FromInteger(value);
break;
}
@@ -349,7 +348,7 @@ namespace OpenMetaverse.StructuredData
string str = reader.ReadString().Trim().ToLower();
if (str == "nan")
value = Double.NaN;
value = double.NaN;
else
Utils.TryParseDouble(str, out value);
@@ -368,8 +367,7 @@ namespace OpenMetaverse.StructuredData
if (reader.Read())
{
UUID value = UUID.Zero;
UUID.TryParse(reader.ReadString().Trim(), out value);
UUID.TryParse(reader.ReadString().Trim(), out var value);
ret = OSD.FromUUID(value);
break;
}
@@ -385,8 +383,7 @@ namespace OpenMetaverse.StructuredData
if (reader.Read())
{
DateTime value = Utils.Epoch;
DateTime.TryParse(reader.ReadString().Trim(), out value);
DateTime.TryParse(reader.ReadString().Trim(), out var value);
ret = OSD.FromDate(value);
break;
}
@@ -397,7 +394,7 @@ namespace OpenMetaverse.StructuredData
if (reader.IsEmptyElement)
{
reader.Read();
return OSD.FromString(String.Empty);
return OSD.FromString(string.Empty);
}
if (reader.Read())
@@ -406,7 +403,7 @@ namespace OpenMetaverse.StructuredData
break;
}
ret = OSD.FromString(String.Empty);
ret = OSD.FromString(string.Empty);
break;
case "binary":
if (reader.IsEmptyElement)
@@ -437,7 +434,7 @@ namespace OpenMetaverse.StructuredData
if (reader.IsEmptyElement)
{
reader.Read();
return OSD.FromUri(new Uri(String.Empty, UriKind.RelativeOrAbsolute));
return OSD.FromUri(new Uri(string.Empty, UriKind.RelativeOrAbsolute));
}
if (reader.Read())
@@ -446,7 +443,7 @@ namespace OpenMetaverse.StructuredData
break;
}
ret = OSD.FromUri(new Uri(String.Empty, UriKind.RelativeOrAbsolute));
ret = OSD.FromUri(new Uri(string.Empty, UriKind.RelativeOrAbsolute));
break;
case "map":
return ParseLLSDXmlMap(reader);
@@ -462,11 +459,9 @@ namespace OpenMetaverse.StructuredData
{
throw new OSDException("Expected </" + type + ">");
}
else
{
reader.Read();
return ret;
}
reader.Read();
return ret;
}
private static OSDMap ParseLLSDXmlMap(XmlTextReader reader)
@@ -561,7 +556,7 @@ namespace OpenMetaverse.StructuredData
if (XmlSchema == null)
{
#region XSD
string schemaText = @"
const string schemaText = @"
<?xml version=""1.0"" encoding=""utf-8""?>
<xs:schema elementFormDefault=""qualified"" xmlns:xs=""http://www.w3.org/2001/XMLSchema"">
<xs:import schemaLocation=""xml.xsd"" namespace=""http://www.w3.org/XML/1998/namespace"" />
@@ -663,10 +658,10 @@ namespace OpenMetaverse.StructuredData
private static void LLSDXmlSchemaValidationHandler(object sender, ValidationEventArgs args)
{
string error = String.Format("Line: {0} - Position: {1} - {2}", XmlTextReader.LineNumber, XmlTextReader.LinePosition,
args.Message);
string error =
$"Line: {XmlTextReader.LineNumber} - Position: {XmlTextReader.LinePosition} - {args.Message}";
if (LastXmlErrors == String.Empty)
if (LastXmlErrors == string.Empty)
LastXmlErrors = error;
else
LastXmlErrors += Environment.NewLine + error;