corrade-vassal

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 21  →  ?path2? @ 22
/Vassal/Vassal/VassalConfiguration.cs
@@ -8,7 +8,6 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Serialization;
 
@@ -42,7 +41,6 @@
public class VassalConfiguration
{
private static readonly object VassalConfigurationLock = new object();
private uint _servicesTimeout = 60000;
 
private ENIGMA _enigma = new ENIGMA
{
@@ -57,6 +55,7 @@
private List<Filter> _outputFilters = new List<Filter>();
private string _password = string.Empty;
private uint _regionRestartDelay = 120;
private uint _servicesTimeout = 60000;
private uint _teleportTimeout = 30000;
private string _vigenereSecret = string.Empty;
 
@@ -244,9 +243,9 @@
{
lock (VassalConfigurationLock)
{
using (StreamWriter writer = new StreamWriter(file, false, Encoding.UTF8))
using (var writer = new StreamWriter(file, false, Encoding.UTF8))
{
XmlSerializer serializer = new XmlSerializer(typeof (VassalConfiguration));
var serializer = new XmlSerializer(typeof(VassalConfiguration));
serializer.Serialize(writer, configuration);
//writer.Flush();
}
@@ -257,10 +256,10 @@
{
lock (VassalConfigurationLock)
{
using (StreamReader stream = new StreamReader(file, Encoding.UTF8))
using (var stream = new StreamReader(file, Encoding.UTF8))
{
XmlSerializer serializer =
new XmlSerializer(typeof (VassalConfiguration));
var serializer =
new XmlSerializer(typeof(VassalConfiguration));
configuration = (VassalConfiguration) serializer.Deserialize(stream);
}
}