StyleCop and TODO

This commit is contained in:
Matthias Mailänder
2014-05-15 09:51:45 +02:00
parent f68a6bbd76
commit c7fad3a693
3 changed files with 33 additions and 26 deletions

View File

@@ -20,19 +20,19 @@ namespace OpenRA.Network
public string Version;
public string Map;
public string Serialize()
{
var data = new List<MiniYamlNode>();
data.Add(new MiniYamlNode("Handshake", FieldSaver.Save(this)));
return data.WriteToString();
}
public static HandshakeRequest Deserialize(string data)
{
var handshake = new HandshakeRequest();
FieldLoader.Load(handshake, MiniYaml.FromString(data).First().Value);
return handshake;
}
public string Serialize()
{
var data = new List<MiniYamlNode>();
data.Add(new MiniYamlNode("Handshake", FieldSaver.Save(this)));
return data.WriteToString();
}
}
public class HandshakeResponse
@@ -42,16 +42,6 @@ namespace OpenRA.Network
public string Password;
[FieldLoader.Ignore] public Session.Client Client;
public string Serialize()
{
var data = new List<MiniYamlNode>();
data.Add( new MiniYamlNode( "Handshake", null,
new string[]{ "Mod", "Version", "Password" }.Select( p => FieldSaver.SaveField(this, p) ).ToList() ) );
data.Add(new MiniYamlNode("Client", FieldSaver.Save(Client)));
return data.WriteToString();
}
public static HandshakeResponse Deserialize(string data)
{
var handshake = new HandshakeResponse();
@@ -59,6 +49,7 @@ namespace OpenRA.Network
var ys = MiniYaml.FromString(data);
foreach (var y in ys)
{
switch (y.Key)
{
case "Handshake":
@@ -68,7 +59,19 @@ namespace OpenRA.Network
FieldLoader.Load(handshake.Client, y.Value);
break;
}
}
return handshake;
}
public string Serialize()
{
var data = new List<MiniYamlNode>();
data.Add(new MiniYamlNode("Handshake", null,
new string[] { "Mod", "Version", "Password" }.Select(p => FieldSaver.SaveField(this, p)).ToList()));
data.Add(new MiniYamlNode("Client", FieldSaver.Save(Client)));
return data.WriteToString();
}
}
}