IsAbstract removed from OptionSetFieldDefinitions and EnumFieldDefinitions (#138)

Author: Archie-Miller

NodeSetToAML.cs

@@ -3168,7 +3168,7 @@ private void AddAttributeData( AttributeFamilyType attribute, UANode uaNode )
 
             AddEnumerationFieldDefinition( attribute, uaNode );
 
-            AddOptionSetFieldDefintion( attribute, uaNode );
+            AddOptionSetFieldDefinition( attribute, uaNode );
 
             AttributeType nodeIdAttribute = AddModifyAttribute( attribute.Attribute,"NodeId", "NodeId", 
                 new Variant( uaNode.DecodedNodeId ) );
@@ -3392,7 +3392,7 @@ private void AddEnumerationFieldDefinition(AttributeFamilyType attribute, UANode
                     {
                         AttributeType fieldAttribute = new AttributeType(new System.Xml.Linq.XElement(defaultNS + "Attribute"));
 
-                        fieldAttribute.RecreateAttributeInstance(enumFieldSource);
+                        RecreateAttributeInstance(enumFieldSource, fieldAttribute);
                         fieldAttribute.Name = fieldDefinition.Name;
 
                         // Remove the Name
@@ -3418,7 +3418,7 @@ private void AddEnumerationFieldDefinition(AttributeFamilyType attribute, UANode
             }
         }
 
-        private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode uaNode )
+        private void AddOptionSetFieldDefinition( AttributeFamilyType attribute, UANode uaNode )
         {
             UADataType optionSetNode = uaNode as UADataType;
             if (optionSetNode != null &&
@@ -3434,7 +3434,7 @@ private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode u
                     AttributeType optionSetFields = new AttributeType(
                         new System.Xml.Linq.XElement(defaultNS + "Attribute"));
 
-                    optionSetFields.RecreateAttributeInstance(optionSetFieldDefinition as AttributeFamilyType);
+                    optionSetFields.RecreateAttributeInstance(optionSetFieldDefinition);
                     optionSetFields.Name = "OptionSetFieldDefinition";
                     optionSetFields.AdditionalInformation.Append(OpcUaTypeOnly);
 
@@ -3452,6 +3452,7 @@ private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode u
                             "Value", "Int32", new Variant(fieldDefinition.Value));
 
                         RemoveUnwantedAttribute(valueAttribute, "NodeId");
+                        RemoveUnwantedAttribute(fieldAttribute, "IsAbstract");
                         RemoveUnwantedAttribute(fieldAttribute, "ValidBits");
                         RemoveUnwantedAttribute(fieldAttribute, "NodeId");
 

SystemTest/TestEnums.cs

@@ -178,6 +178,7 @@ public void TestFieldDefinition(uint nodeId, object enumObject)
 
             foreach (AttributeType fieldDefinition in enumFieldDefinition.Attribute)
             {
+                Assert.IsNull(fieldDefinition.Attribute["IsAbstract"]);
                 AttributeType valueAttribute = fieldDefinition.Attribute["Value"];
                 Assert.IsNotNull(valueAttribute, "Field Definition Value is null");
                 Assert.IsNotNull(valueAttribute.Value, "Field Definition Value-Value is null");

SystemTest/TestOptionSetEmptyValues.cs

@@ -108,6 +108,7 @@ public void TestFieldDefinitions(string attributeName, string attributeValue)
             AttributeType attribute = GetAttribute(fieldDefinition, attributeName);
 
             Assert.IsNull(attribute.Attribute["NodeId"]);
+            Assert.IsNull(attribute.Attribute["IsAbstract"]);
             AttributeType valueAttribute = GetAttribute(attribute, "Value");
             Assert.AreEqual( valueAttribute.Value, attributeValue);