From d56b9bfef8a43a00bde283ce052da1917949d20e Mon Sep 17 00:00:00 2001 From: sta Date: Sun, 14 Feb 2016 16:16:20 +0900 Subject: [PATCH] [Modify] Rename it --- websocket-sharp/WebSocket.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index b7fd69be..21df704b 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -719,18 +719,8 @@ namespace WebSocketSharp return true; } - private string checkIfAvailable ( - bool client, bool server, bool connecting, bool open, bool closing, bool closed) - { - return !client && _client - ? "This operation isn't available in: client" - : !server && !_client - ? "This operation isn't available in: server" - : _readyState.CheckIfAvailable (connecting, open, closing, closed); - } - // As client - private bool checkIfValidHandshakeResponse (HttpResponse response, out string message) + private bool checkHandshakeResponse (HttpResponse response, out string message) { message = null; @@ -773,6 +763,16 @@ namespace WebSocketSharp return true; } + private string checkIfAvailable ( + bool client, bool server, bool connecting, bool open, bool closing, bool closed) + { + return !client && _client + ? "This operation isn't available in: client" + : !server && !_client + ? "This operation isn't available in: server" + : _readyState.CheckIfAvailable (connecting, open, closing, closed); + } + private bool checkIfValidReceivedFrame (WebSocketFrame frame, out string message) { message = null; @@ -1005,7 +1005,7 @@ namespace WebSocketSharp var res = sendHandshakeRequest (); string msg; - if (!checkIfValidHandshakeResponse (res, out msg)) + if (!checkHandshakeResponse (res, out msg)) throw new WebSocketException (CloseStatusCode.ProtocolError, msg); if (_protocolsRequested)