DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored CloseEventArgs.cs

Browse Source
This commit is contained in:
sta 2014-07-05 17:01:24 +09:00
parent 328988411f
commit 35b8848d38
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
websocket-sharp/CloseEventArgs.cs
View File

@ -32,13 +32,12 @@ using System.Text;
namespace WebSocketSharp namespace WebSocketSharp
{ {
/// <summary> /// <summary>
/// Contains the event data associated with a <see cref="WebSocket.OnClose"/> /// Contains the event data associated with a <see cref="WebSocket.OnClose"/> event.
/// event.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection /// A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection has been closed.
/// has been closed. If you want to get the reason for closure, you access the /// If you would like to get the reason for the close, you should access the <see cref="Code"/> or
/// <see cref="Code"/> or <see cref="Reason"/> property. /// <see cref="Reason"/> property.
/// </remarks> /// </remarks>
public class CloseEventArgs : EventArgs public class CloseEventArgs : EventArgs
{ {
@ -55,9 +54,14 @@ namespace WebSocketSharp
internal CloseEventArgs (PayloadData payload) internal CloseEventArgs (PayloadData payload)
{ {
var data = payload.ApplicationData; var data = payload.ApplicationData;
_code = getCodeFrom (data); var len = data.Length;
_reason = getReasonFrom (data); _code = len > 1
_clean = false; ? data.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
: (ushort) CloseStatusCode.NoStatusCode;
_reason = len > 2
? Encoding.UTF8.GetString (data.SubArray (2, len - 2))
: String.Empty;
} }
#endregion #endregion
@ -65,10 +69,10 @@ namespace WebSocketSharp
#region Public Properties #region Public Properties
/// <summary> /// <summary>
/// Gets the status code for closure. /// Gets the status code for the close.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="ushort"/> that indicates the status code for closure if any. /// A <see cref="ushort"/> that represents the status code for the close if any.
/// </value> /// </value>
public ushort Code { public ushort Code {
get { get {
@ -77,10 +81,10 @@ namespace WebSocketSharp
} }
/// <summary> /// <summary>
/// Gets the reason for closure. /// Gets the reason for the close.
/// </summary> /// </summary>
/// <value> /// <value>
/// A <see cref="string"/> that represents the reason for closure if any. /// A <see cref="string"/> that represents the reason for the close if any.
/// </value> /// </value>
public string Reason { public string Reason {
get { get {
@ -89,12 +93,10 @@ namespace WebSocketSharp
} }
/// <summary> /// <summary>
/// Gets a value indicating whether the WebSocket connection has been closed /// Gets a value indicating whether the WebSocket connection has been closed cleanly.
/// cleanly.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the WebSocket connection has been closed cleanly; /// <c>true</c> if the WebSocket connection has been closed cleanly; otherwise, <c>false</c>.
/// otherwise, <c>false</c>.
/// </value> /// </value>
public bool WasClean { public bool WasClean {
get { get {
@ -107,24 +109,5 @@ namespace WebSocketSharp
} }
#endregion #endregion
#region Private Methods
private static ushort getCodeFrom (byte [] data)
{
return data.Length > 1
? data.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
: (ushort) CloseStatusCode.NoStatusCode;
}
private static string getReasonFrom (byte [] data)
{
var len = data.Length;
return len > 2
? Encoding.UTF8.GetString (data.SubArray (2, len - 2))
: String.Empty;
}
#endregion
} }
} }