Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamXmlSerialization.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamXmlSerialization.cs (.../DamXmlSerialization.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamXmlSerialization.cs (.../DamXmlSerialization.cs) (revision 4000) @@ -21,8 +21,8 @@ using System.IO; using System.Xml.Serialization; +using Deltares.DamEngine.Io.XmlInput; using Deltares.DamEngine.Io.XmlOutput; -using Input = Deltares.DamEngine.Io.XmlInput.Input; namespace Deltares.DamEngine.Io { @@ -35,7 +35,7 @@ /// The input. public static void SaveInputAsXmlFile(string filename, Input input) { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); + var xmlSerializer = new XmlSerializer(typeof(Input)); TextWriter writer = new StreamWriter(filename); xmlSerializer.Serialize(writer, input); writer.Close(); @@ -49,9 +49,9 @@ public static Input LoadInputFromXmlFile(string filename) { Input input; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); - FileStream fs = new FileStream(filename, FileMode.Open); - input = (Input)xmlSerializer.Deserialize(fs); + var xmlSerializer = new XmlSerializer(typeof(Input)); + var fs = new FileStream(filename, FileMode.Open); + input = (Input) xmlSerializer.Deserialize(fs); return input; } @@ -62,7 +62,7 @@ /// xm string public static string SaveInputAsXmlString(Input input) { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); + var xmlSerializer = new XmlSerializer(typeof(Input)); TextWriter writer = new StringWriter(); xmlSerializer.Serialize(writer, input); return writer.ToString(); @@ -76,9 +76,9 @@ public static Input LoadInputFromXmlString(string xmlString) { Input input; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Input)); - StringReader reader = new StringReader(xmlString); - input = (Input)xmlSerializer.Deserialize(reader); + var xmlSerializer = new XmlSerializer(typeof(Input)); + var reader = new StringReader(xmlString); + input = (Input) xmlSerializer.Deserialize(reader); return input; } @@ -89,7 +89,7 @@ /// The output. public static void SaveOutputAsXmlFile(string filename, Output output) { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Output)); + var xmlSerializer = new XmlSerializer(typeof(Output)); TextWriter writer = new StreamWriter(filename); xmlSerializer.Serialize(writer, output); writer.Close(); @@ -103,23 +103,25 @@ public static Output LoadOutputFromXmlFile(string filename) { Output output; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Output)); - FileStream fs = new FileStream(filename, FileMode.Open); - output = (Output)xmlSerializer.Deserialize(fs); + var xmlSerializer = new XmlSerializer(typeof(Output)); + var fs = new FileStream(filename, FileMode.Open); + output = (Output) xmlSerializer.Deserialize(fs); return output; } + /// /// Saves the output as XML string. /// /// The output. /// public static string SaveOutputAsXmlString(Output output) { - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Output)); + var xmlSerializer = new XmlSerializer(typeof(Output)); TextWriter writer = new StringWriter(); xmlSerializer.Serialize(writer, output); return writer.ToString(); } + /// /// Loads the output from XML string. /// @@ -128,10 +130,10 @@ public static Output LoadOutputFromXmlString(string outputXml) { Output output; - XmlSerializer xmlSerializer = new XmlSerializer(typeof(Output)); - StringReader reader = new StringReader(outputXml); - output = (Output)xmlSerializer.Deserialize(reader); + var xmlSerializer = new XmlSerializer(typeof(Output)); + var reader = new StringReader(outputXml); + output = (Output) xmlSerializer.Deserialize(reader); return output; } } -} +} \ No newline at end of file