corrade-vassal

Subversion Repositories:

 /Vassal/Vassal/VassalConfiguration.cs
@@ -10,7 +10,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Serialization;
 namespace Vassal
@@ -20,27 +19,13 @@
     /// </summary>
     public enum Filter : uint
     {
-        [XmlEnum(Name = "none")]
-        [Description("none")]
-        NONE = 0,
-        [XmlEnum(Name = "RFC1738")]
-        [Description("RFC1738")]
-        RFC1738,
-        [XmlEnum(Name = "RFC3986")]
-        [Description("RFC3986")]
-        RFC3986,
-        [XmlEnum(Name = "ENIGMA")]
-        [Description("ENIGMA")]
-        ENIGMA,
-        [XmlEnum(Name = "VIGENERE")]
-        [Description("VIGENERE")]
-        VIGENERE,
-        [XmlEnum(Name = "ATBASH")]
-        [Description("ATBASH")]
-        ATBASH,
-        [XmlEnum(Name = "BASE64")]
-        [Description("BASE64")]
-        BASE64
+        [XmlEnum(Name = "none")] [Description("none")] NONE = 0,
+        [XmlEnum(Name = "RFC1738")] [Description("RFC1738")] RFC1738,
+        [XmlEnum(Name = "RFC3986")] [Description("RFC3986")] RFC3986,
+        [XmlEnum(Name = "ENIGMA")] [Description("ENIGMA")] ENIGMA,
+        [XmlEnum(Name = "VIGENERE")] [Description("VIGENERE")] VIGENERE,
+        [XmlEnum(Name = "ATBASH")] [Description("ATBASH")] ATBASH,
+        [XmlEnum(Name = "BASE64")] [Description("BASE64")] BASE64
     }
     /// <summary>
@@ -57,11 +42,8 @@
     public class VassalConfiguration
     {
         private static readonly object VassalConfigurationLock = new object();
+        private uint _dataTimeout = 15000;
-        private string _HTTPServerURL = @"http://127.0.0.1:8080/";
-        private string _group = string.Empty;
-        private string _password = string.Empty;
         private ENIGMA _enigma = new ENIGMA
         {
             rotors = new[] { '3', 'g', '1' },
@@ -68,12 +50,15 @@
             plugs = new[] { 'z', 'p', 'q' },
             reflector = 'b'
         };
+        private string _group = string.Empty;
+        private string _HTTPServerURL = @"http://127.0.0.1:8080/";
         private List<Filter> _inputFilters = new List<Filter>();
         private List<Filter> _outputFilters = new List<Filter>();
+        private string _password = string.Empty;
+        private uint _regionRestartDelay = 120;
+        private uint _teleportTimeout = 30000;
         private string _vigenereSecret = string.Empty;
-        private uint _teleportTimeout = 30000;
-        private uint _dataTimeout = 15000;
-        private uint _regionRestartDelay = 120;
         public string Group
         {

Compare Path:	Rev
With Path:	Rev