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

[Modify] Polish it

Browse Source
This commit is contained in:
sta 2015-11-18 15:23:58 +09:00
parent e38c614906
commit 974f6dc1d7
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
websocket-sharp/CloseEventArgs.cs
View File

@ -27,21 +27,20 @@
#endregion #endregion
using System; using System;
using System.Text;
namespace WebSocketSharp namespace WebSocketSharp
{ {
/// <summary> /// <summary>
/// Contains the event data associated with a <see cref="WebSocket.OnClose"/> event. /// Represents the event data for the <see cref="WebSocket.OnClose"/> event.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <para> /// <para>
/// A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection has been /// A <see cref="WebSocket.OnClose"/> event occurs when the WebSocket connection
/// closed. /// has been closed.
/// </para> /// </para>
/// <para> /// <para>
/// If you would like to get the reason for the close, you should access /// If you would like to get the reason for the close, you should access
/// the <see cref="CloseEventArgs.Code"/> or <see cref="CloseEventArgs.Reason"/> property. /// the <see cref="Code"/> or <see cref="Reason"/> property.
/// </para> /// </para>
/// </remarks> /// </remarks>
public class CloseEventArgs : EventArgs public class CloseEventArgs : EventArgs
@ -51,7 +50,6 @@ namespace WebSocketSharp
private bool _clean; private bool _clean;
private ushort _code; private ushort _code;
private PayloadData _payloadData; private PayloadData _payloadData;
private byte[] _rawData;
private string _reason; private string _reason;
#endregion #endregion
@ -61,14 +59,12 @@ namespace WebSocketSharp
internal CloseEventArgs () internal CloseEventArgs ()
{ {
_code = (ushort) CloseStatusCode.NoStatus; _code = (ushort) CloseStatusCode.NoStatus;
_payloadData = new PayloadData (); _payloadData = PayloadData.Empty;
_rawData = _payloadData.ApplicationData;
} }
internal CloseEventArgs (ushort code) internal CloseEventArgs (ushort code)
{ {
_code = code; _code = code;
_rawData = code.InternalToByteArray (ByteOrder.Big);
} }
internal CloseEventArgs (CloseStatusCode code) internal CloseEventArgs (CloseStatusCode code)
@ -79,15 +75,15 @@ namespace WebSocketSharp
internal CloseEventArgs (PayloadData payloadData) internal CloseEventArgs (PayloadData payloadData)
{ {
_payloadData = payloadData; _payloadData = payloadData;
_rawData = payloadData.ApplicationData;
var len = _rawData.Length; var data = payloadData.ApplicationData;
var len = data.Length;
_code = len > 1 _code = len > 1
? _rawData.SubArray (0, 2).ToUInt16 (ByteOrder.Big) ? data.SubArray (0, 2).ToUInt16 (ByteOrder.Big)
: (ushort) CloseStatusCode.NoStatus; : (ushort) CloseStatusCode.NoStatus;
_reason = len > 2 _reason = len > 2
? _rawData.SubArray (2, len - 2).UTF8Decode () ? data.SubArray (2, len - 2).UTF8Decode ()
: String.Empty; : String.Empty;
} }
@ -95,7 +91,6 @@ namespace WebSocketSharp
{ {
_code = code; _code = code;
_reason = reason; _reason = reason;
_rawData = code.Append (reason);
} }
internal CloseEventArgs (CloseStatusCode code, string reason) internal CloseEventArgs (CloseStatusCode code, string reason)
@ -109,13 +104,7 @@ namespace WebSocketSharp
internal PayloadData PayloadData { internal PayloadData PayloadData {
get { get {
return _payloadData ?? (_payloadData = new PayloadData (_rawData)); return _payloadData ?? (_payloadData = new PayloadData (_code.Append (_reason)));
}
}
internal byte[] RawData {
get {
return _rawData;
} }
} }
@ -148,10 +137,10 @@ namespace WebSocketSharp
} }
/// <summary> /// <summary>
/// Gets a value indicating whether the WebSocket connection has been closed cleanly. /// Gets a value indicating whether the connection has been closed cleanly.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if the WebSocket connection has been closed cleanly; otherwise, <c>false</c>. /// <c>true</c> if the connection has been closed cleanly; otherwise, <c>false</c>.
/// </value> /// </value>
public bool WasClean { public bool WasClean {
get { get {