Converted the GetAttribute methods in the ToolBox class to extension methods

2017-10-04 18:38:40 +03:00
parent 6c7c97a875
commit 1ff2054ca8
99 changed files with 854 additions and 875 deletions
@@ -63,7 +63,7 @@ namespace Barotrauma
        public ContentPackage(string filePath)
            : this()
        {
-            XDocument doc = ToolBox.TryLoadXml(filePath);
+            XDocument doc = XMLExtensions.TryLoadXml(filePath);

            Path = filePath;

@@ -74,12 +74,12 @@ namespace Barotrauma
            }


-            name = ToolBox.GetAttributeString(doc.Root, "name", "");
+            name = doc.Root.GetAttributeString("name", "");
            
            foreach (XElement subElement in doc.Root.Elements())
            {
                ContentType type = (ContentType)Enum.Parse(typeof(ContentType), subElement.Name.ToString(), true);
-                files.Add(new ContentFile(ToolBox.GetAttributeString(subElement, "file", ""), type));                
+                files.Add(new ContentFile(subElement.GetAttributeString("file", ""), type));                
            }
        }