@@ -261,7 +261,7 @@ ClassNode GetClassNodeFromElementReference()
261
261
{
262
262
Name = e . Attribute ( XmlNameAttribute ) ? . Value ?? string . Empty ,
263
263
Comment = e . Attribute ( XmlCommentAttribute ) ? . Value ?? string . Empty ,
264
- IsHidden = e . Attribute ( XmlHiddenAttribute ) ? . Value . Equals ( "True" ) ?? false
264
+ IsHidden = ( bool ? ) e . Attribute ( XmlHiddenAttribute ) ?? false
265
265
} ) ;
266
266
267
267
foreach ( var vmethodNode in nodes )
@@ -272,20 +272,17 @@ ClassNode GetClassNodeFromElementReference()
272
272
}
273
273
case BaseWrapperArrayNode arrayNode :
274
274
{
275
- TryGetAttributeValue ( element , XmlCountAttribute , out var count , logger ) ;
276
- arrayNode . Count = count ;
275
+ arrayNode . Count = ( int ? ) element . Attribute ( XmlCountAttribute ) ?? 0 ;
277
276
break ;
278
277
}
279
278
case BaseTextNode textNode :
280
279
{
281
- TryGetAttributeValue ( element , XmlLengthAttribute , out var length , logger ) ;
282
- textNode . Length = length ;
280
+ textNode . Length = ( int ? ) element . Attribute ( XmlLengthAttribute ) ?? 0 ;
283
281
break ;
284
282
}
285
283
case BitFieldNode bitFieldNode :
286
284
{
287
- TryGetAttributeValue ( element , XmlBitsAttribute , out var bits , logger ) ;
288
- bitFieldNode . Bits = bits ;
285
+ bitFieldNode . Bits = ( int ? ) element . Attribute ( XmlBitsAttribute ) ?? 0 ;
289
286
break ;
290
287
}
291
288
case FunctionNode functionNode :
@@ -312,21 +309,6 @@ ClassNode GetClassNodeFromElementReference()
312
309
return node ;
313
310
}
314
311
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
-
330
312
public static Tuple < List < ClassNode > , List < BaseNode > > DeserializeNodesFromStream ( Stream input , ReClassNetProject templateProject , ILogger logger )
331
313
{
332
314
Contract . Requires ( input != null ) ;
0 commit comments