From f214be71bf5a160718a667c90c806442832a1ca4 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 14 Apr 2013 12:34:34 +0000 Subject: [PATCH] code formatting, client lines coloring --- src/main/html/css/core.css | 3 ++- src/main/html/js/main.js | 4 +++- .../java/forge/net/protocol/incoming/PacketOpcode.java | 10 ++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/html/css/core.css b/src/main/html/css/core.css index 0c74fd03a90..e3471229eba 100644 --- a/src/main/html/css/core.css +++ b/src/main/html/css/core.css @@ -7,12 +7,13 @@ div.wrap { width: 640px; margin: 100px auto;} .title input {width: 300px; } .title span { display: inline-block; width: 120px; text-align: right; } -.messages { height: 20ex; overflow: auto; background-color: #eee; padding: 4px; border: 1px solid black; list-style: none; } +.messages { height: 20ex; overflow: auto; background-color: #fff; padding: 4px; border: 1px solid black; list-style: none; } .messages .incoming { color: #006; } .messages .incoming:before { content: "<< "} .messages .outcoming { color: #060; } .messages .outcoming:before { content: ">> "} .messages .error { color: #600; } +.messages li:nth-child(2n) { background-color: #f7f7f7; } .packets { padding: 4px; background-color: #ddd; border: 1px solid black; border-top: 0px; display: none; } .packets span { display: inline-block; width: 120px; text-align: right; } diff --git a/src/main/html/js/main.js b/src/main/html/js/main.js index 964ea5230c2..a1dc55511fb 100644 --- a/src/main/html/js/main.js +++ b/src/main/html/js/main.js @@ -31,7 +31,9 @@ function addLi(className, text) { } function onConnectClicked() { - server.connect($("#ws_uri").val()); + var uri = $("#ws_uri").val() + addLi("connecting", "Connecting to ws://" + uri + " ..." ) + server.connect(uri); $('#connect').attr("disabled", "disabled") $('#disconn').removeAttr("disabled") diff --git a/src/main/java/forge/net/protocol/incoming/PacketOpcode.java b/src/main/java/forge/net/protocol/incoming/PacketOpcode.java index face2ed2c53..656cdce45ee 100644 --- a/src/main/java/forge/net/protocol/incoming/PacketOpcode.java +++ b/src/main/java/forge/net/protocol/incoming/PacketOpcode.java @@ -44,12 +44,10 @@ public enum PacketOpcode { private static IPacket decodePacket(PacketOpcode code, String data) { switch(code) { - case Echo: - return EchoPacket.parse(data); - case Authorize: - return AuthorizePacket.parse(data); - default: - return UnknownPacket.parse(data); + case Echo: return EchoPacket.parse(data); + case Authorize: return AuthorizePacket.parse(data); + + default: return UnknownPacket.parse(data); } } }