@@ -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 ) ;
0 commit comments