Skip to content

Commit 33985fb

Browse files
committed
Removed TryGetAttributeValue method.
1 parent b163b5f commit 33985fb

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

ReClass.NET/DataExchange/ReClass/ReClassNetFile.Read.cs

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ ClassNode GetClassNodeFromElementReference()
261261
{
262262
Name = e.Attribute(XmlNameAttribute)?.Value ?? string.Empty,
263263
Comment = e.Attribute(XmlCommentAttribute)?.Value ?? string.Empty,
264-
IsHidden = e.Attribute(XmlHiddenAttribute)?.Value.Equals("True") ?? false
264+
IsHidden = (bool?)e.Attribute(XmlHiddenAttribute) ?? false
265265
});
266266

267267
foreach (var vmethodNode in nodes)
@@ -272,20 +272,17 @@ ClassNode GetClassNodeFromElementReference()
272272
}
273273
case BaseWrapperArrayNode arrayNode:
274274
{
275-
TryGetAttributeValue(element, XmlCountAttribute, out var count, logger);
276-
arrayNode.Count = count;
275+
arrayNode.Count = (int?)element.Attribute(XmlCountAttribute) ?? 0;
277276
break;
278277
}
279278
case BaseTextNode textNode:
280279
{
281-
TryGetAttributeValue(element, XmlLengthAttribute, out var length, logger);
282-
textNode.Length = length;
280+
textNode.Length = (int?)element.Attribute(XmlLengthAttribute) ?? 0;
283281
break;
284282
}
285283
case BitFieldNode bitFieldNode:
286284
{
287-
TryGetAttributeValue(element, XmlBitsAttribute, out var bits, logger);
288-
bitFieldNode.Bits = bits;
285+
bitFieldNode.Bits = (int?)element.Attribute(XmlBitsAttribute) ?? 0;
289286
break;
290287
}
291288
case FunctionNode functionNode:
@@ -312,21 +309,6 @@ ClassNode GetClassNodeFromElementReference()
312309
return node;
313310
}
314311

315-
private static void TryGetAttributeValue(XElement element, string attribute, out int val, ILogger logger)
316-
{
317-
Contract.Requires(element != null);
318-
Contract.Requires(attribute != null);
319-
Contract.Requires(logger != null);
320-
321-
if (!int.TryParse(element.Attribute(attribute)?.Value, out val))
322-
{
323-
val = 0;
324-
325-
logger.Log(LogLevel.Error, $"Node is missing a valid '{attribute}' attribute, defaulting to 0.");
326-
logger.Log(LogLevel.Warning, element.ToString());
327-
}
328-
}
329-
330312
public static Tuple<List<ClassNode>, List<BaseNode>> DeserializeNodesFromStream(Stream input, ReClassNetProject templateProject, ILogger logger)
331313
{
332314
Contract.Requires(input != null);

ReClass.NET/DataExchange/ReClass/ReClassNetFile.Write.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ XElement CreateElement()
115115

116116
element.SetAttributeValue(XmlNameAttribute, node.Name ?? string.Empty);
117117
element.SetAttributeValue(XmlCommentAttribute, node.Comment ?? string.Empty);
118-
element.SetAttributeValue(XmlHiddenAttribute, node.IsHidden.ToString());
118+
element.SetAttributeValue(XmlHiddenAttribute, node.IsHidden);
119119

120120
if (node is BaseWrapperNode wrapperNode)
121121
{
@@ -137,7 +137,7 @@ XElement CreateElement()
137137
XmlMethodElement,
138138
new XAttribute(XmlNameAttribute, n.Name ?? string.Empty),
139139
new XAttribute(XmlCommentAttribute, n.Comment ?? string.Empty),
140-
new XAttribute(XmlHiddenAttribute, n.IsHidden.ToString())
140+
new XAttribute(XmlHiddenAttribute, n.IsHidden)
141141
)));
142142
break;
143143
}

0 commit comments

Comments
 (0)