From add5386127d9766457d510155e30f296184c4d34 Mon Sep 17 00:00:00 2001 From: Andy Janata Date: Mon, 12 Mar 2012 21:06:35 -0700 Subject: [PATCH] POSSIBLY BREAKING CHANGE: change all the over-the-wire Constant values to shorter things. --- WebContent/js/cah.constants.js | 332 ++++++++++++------------- src/net/socialgamer/cah/Constants.java | 210 ++++++++-------- 2 files changed, 272 insertions(+), 270 deletions(-) diff --git a/WebContent/js/cah.constants.js b/WebContent/js/cah.constants.js index c6bd36b..2c7365c 100644 --- a/WebContent/js/cah.constants.js +++ b/WebContent/js/cah.constants.js @@ -6,230 +6,230 @@ cah.$.AjaxOperation = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.AjaxOperation.prototype.dummyForAutocomplete = undefined; -cah.$.AjaxOperation.START_GAME = "start_game"; -cah.$.AjaxOperation.FIRST_LOAD = "firstload"; -cah.$.AjaxOperation.JUDGE_SELECT = "judge_select"; -cah.$.AjaxOperation.LOG_OUT = "logout"; -cah.$.AjaxOperation.GAME_LIST = "game_list"; -cah.$.AjaxOperation.GET_GAME_INFO = "get_game_info"; -cah.$.AjaxOperation.PLAY_CARD = "play_card"; -cah.$.AjaxOperation.CREATE_GAME = "create_game"; -cah.$.AjaxOperation.ADMIN_SET_VERBOSE_LOG = "set_verbose_log"; -cah.$.AjaxOperation.GET_CARDS = "get_cards"; -cah.$.AjaxOperation.JOIN_GAME = "join_game"; -cah.$.AjaxOperation.REGISTER = "register"; -cah.$.AjaxOperation.CHAT = "chat"; -cah.$.AjaxOperation.LEAVE_GAME = "leave_game"; -cah.$.AjaxOperation.NAMES = "get_names"; +cah.$.AjaxOperation.START_GAME = "sg"; +cah.$.AjaxOperation.FIRST_LOAD = "fl"; +cah.$.AjaxOperation.JUDGE_SELECT = "js"; +cah.$.AjaxOperation.LOG_OUT = "lo"; +cah.$.AjaxOperation.GAME_LIST = "ggl"; +cah.$.AjaxOperation.GET_GAME_INFO = "ggi"; +cah.$.AjaxOperation.PLAY_CARD = "pc"; +cah.$.AjaxOperation.CREATE_GAME = "cg"; +cah.$.AjaxOperation.ADMIN_SET_VERBOSE_LOG = "svl"; +cah.$.AjaxOperation.GET_CARDS = "gc"; +cah.$.AjaxOperation.JOIN_GAME = "jg"; +cah.$.AjaxOperation.REGISTER = "r"; +cah.$.AjaxOperation.CHAT = "c"; +cah.$.AjaxOperation.LEAVE_GAME = "lg"; +cah.$.AjaxOperation.NAMES = "gn"; cah.$.AjaxRequest = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.AjaxRequest.prototype.dummyForAutocomplete = undefined; -cah.$.AjaxRequest.MESSAGE = "message"; -cah.$.AjaxRequest.CARD_ID = "card_id"; -cah.$.AjaxRequest.GAME_ID = "game_id"; -cah.$.AjaxRequest.SERIAL = "serial"; -cah.$.AjaxRequest.OP = "op"; -cah.$.AjaxRequest.NICKNAME = "nickname"; +cah.$.AjaxRequest.MESSAGE = "m"; +cah.$.AjaxRequest.CARD_ID = "cid"; +cah.$.AjaxRequest.GAME_ID = "gid"; +cah.$.AjaxRequest.SERIAL = "s"; +cah.$.AjaxRequest.OP = "o"; +cah.$.AjaxRequest.NICKNAME = "n"; cah.$.AjaxResponse = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.AjaxResponse.prototype.dummyForAutocomplete = undefined; -cah.$.AjaxResponse.WHITE_CARDS = "white_cards"; -cah.$.AjaxResponse.GAME_ID = "game_id"; -cah.$.AjaxResponse.HAND = "hand"; -cah.$.AjaxResponse.PLAYER_INFO = "player_info"; -cah.$.AjaxResponse.BLACK_CARD = "black_card"; -cah.$.AjaxResponse.IN_PROGRESS = "in_progress"; -cah.$.AjaxResponse.GAMES = "games"; -cah.$.AjaxResponse.NICKNAME = "nickname"; -cah.$.AjaxResponse.CARD_ID = "card_id"; +cah.$.AjaxResponse.WHITE_CARDS = "wc"; +cah.$.AjaxResponse.GAME_ID = "gid"; +cah.$.AjaxResponse.HAND = "h"; +cah.$.AjaxResponse.PLAYER_INFO = "pi"; +cah.$.AjaxResponse.BLACK_CARD = "bc"; +cah.$.AjaxResponse.IN_PROGRESS = "ip"; +cah.$.AjaxResponse.GAMES = "gl"; +cah.$.AjaxResponse.NICKNAME = "n"; +cah.$.AjaxResponse.CARD_ID = "cid"; cah.$.AjaxResponse.NEXT = "next"; -cah.$.AjaxResponse.GAME_INFO = "game_info"; -cah.$.AjaxResponse.ERROR = "error"; -cah.$.AjaxResponse.ERROR_CODE = "error_code"; -cah.$.AjaxResponse.SERIAL = "serial"; -cah.$.AjaxResponse.MAX_GAMES = "max_games"; -cah.$.AjaxResponse.NAMES = "names"; +cah.$.AjaxResponse.GAME_INFO = "gi"; +cah.$.AjaxResponse.ERROR = "e"; +cah.$.AjaxResponse.ERROR_CODE = "ec"; +cah.$.AjaxResponse.SERIAL = "s"; +cah.$.AjaxResponse.MAX_GAMES = "mg"; +cah.$.AjaxResponse.NAMES = "nl"; cah.$.BlackCardData = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.BlackCardData.prototype.dummyForAutocomplete = undefined; -cah.$.BlackCardData.TEXT = "text"; -cah.$.BlackCardData.PICK = "pick"; -cah.$.BlackCardData.ID = "card_id"; -cah.$.BlackCardData.DRAW = "draw"; +cah.$.BlackCardData.TEXT = "T"; +cah.$.BlackCardData.PICK = "PK"; +cah.$.BlackCardData.ID = "cid"; +cah.$.BlackCardData.DRAW = "D"; cah.$.DisconnectReason = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.DisconnectReason.prototype.dummyForAutocomplete = undefined; -cah.$.DisconnectReason.PING_TIMEOUT = "ping_timeout"; -cah.$.DisconnectReason.KICKED = "kicked"; -cah.$.DisconnectReason.MANUAL = "manual"; +cah.$.DisconnectReason.PING_TIMEOUT = "pt"; +cah.$.DisconnectReason.KICKED = "k"; +cah.$.DisconnectReason.MANUAL = "man"; cah.$.ErrorCode = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.ErrorCode.prototype.dummyForAutocomplete = undefined; -cah.$.ErrorCode.TOO_MANY_GAMES = "too_many_games"; -cah.$.ErrorCode.NO_CARD_SPECIFIED = "no_card_spec"; -cah.$.ErrorCode.ACCESS_DENIED = "access_denied"; -cah.$.ErrorCode.NOT_GAME_HOST = "not_game_host"; -cah.$.ErrorCode.CANNOT_JOIN_ANOTHER_GAME = "cannot_join_another_game"; -cah.$.ErrorCode.INVALID_CARD = "invalid_card"; -cah.$.ErrorCode.NO_GAME_SPECIFIED = "no_game_spec"; -cah.$.ErrorCode.SESSION_EXPIRED = "session_expired"; -cah.$.ErrorCode.BAD_OP = "bad_op"; -cah.$.ErrorCode.NO_SESSION = "no_session"; -cah.$.ErrorCode.NOT_REGISTERED = "not_registered"; -cah.$.ErrorCode.NOT_JUDGE = "not_judge"; -cah.$.ErrorCode.OP_NOT_SPECIFIED = "op_not_spec"; -cah.$.ErrorCode.NOT_IN_THAT_GAME = "not_in_that_game"; -cah.$.ErrorCode.NICK_IN_USE = "nick_in_use"; -cah.$.ErrorCode.SERVER_ERROR = "server_error"; -cah.$.ErrorCode.GAME_FULL = "game_full"; -cah.$.ErrorCode.NO_NICK_SPECIFIED = "no_nick_spec"; -cah.$.ErrorCode.NOT_YOUR_TURN = "not_your_turn"; -cah.$.ErrorCode.INVALID_NICK = "invalid_nick"; -cah.$.ErrorCode.ALREADY_STARTED = "already_started"; -cah.$.ErrorCode.BAD_REQUEST = "bad_req"; -cah.$.ErrorCode.DO_NOT_HAVE_CARD = "do_not_have_card"; -cah.$.ErrorCode.MESSAGE_TOO_LONG = "msg_too_long"; -cah.$.ErrorCode.NOT_ENOUGH_PLAYERS = "not_enough_players"; -cah.$.ErrorCode.INVALID_GAME = "invalid_game"; -cah.$.ErrorCode.NO_MSG_SPECIFIED = "no_msg_spec"; +cah.$.ErrorCode.TOO_MANY_GAMES = "tmg"; +cah.$.ErrorCode.NO_CARD_SPECIFIED = "ncs"; +cah.$.ErrorCode.ACCESS_DENIED = "ad"; +cah.$.ErrorCode.NOT_GAME_HOST = "ngh"; +cah.$.ErrorCode.CANNOT_JOIN_ANOTHER_GAME = "cjag"; +cah.$.ErrorCode.INVALID_CARD = "ic"; +cah.$.ErrorCode.NO_GAME_SPECIFIED = "ngs"; +cah.$.ErrorCode.SESSION_EXPIRED = "se"; +cah.$.ErrorCode.BAD_OP = "bo"; +cah.$.ErrorCode.NO_SESSION = "ns"; +cah.$.ErrorCode.NOT_REGISTERED = "nr"; +cah.$.ErrorCode.NOT_JUDGE = "nj"; +cah.$.ErrorCode.OP_NOT_SPECIFIED = "ons"; +cah.$.ErrorCode.NOT_IN_THAT_GAME = "nitg"; +cah.$.ErrorCode.NICK_IN_USE = "niu"; +cah.$.ErrorCode.SERVER_ERROR = "serr"; +cah.$.ErrorCode.GAME_FULL = "gf"; +cah.$.ErrorCode.NO_NICK_SPECIFIED = "nns"; +cah.$.ErrorCode.NOT_YOUR_TURN = "nyt"; +cah.$.ErrorCode.INVALID_NICK = "in"; +cah.$.ErrorCode.ALREADY_STARTED = "as"; +cah.$.ErrorCode.BAD_REQUEST = "br"; +cah.$.ErrorCode.DO_NOT_HAVE_CARD = "dnhc"; +cah.$.ErrorCode.MESSAGE_TOO_LONG = "mtl"; +cah.$.ErrorCode.NOT_ENOUGH_PLAYERS = "nep"; +cah.$.ErrorCode.INVALID_GAME = "ig"; +cah.$.ErrorCode.NO_MSG_SPECIFIED = "nms"; cah.$.ErrorCode_msg = {}; -cah.$.ErrorCode_msg['bad_op'] = "Invalid operation."; -cah.$.ErrorCode_msg['not_registered'] = "Not registered. Refresh the page."; -cah.$.ErrorCode_msg['server_error'] = "An error occured on the server."; -cah.$.ErrorCode_msg['not_enough_players'] = "There are not enough players to start the game."; -cah.$.ErrorCode_msg['session_expired'] = "Your session has expired. Refresh the page."; -cah.$.ErrorCode_msg['invalid_game'] = "Invalid game specified."; -cah.$.ErrorCode_msg['not_judge'] = "You aren't the judge."; -cah.$.ErrorCode_msg['no_card_spec'] = "No card specified."; -cah.$.ErrorCode_msg['game_full'] = "That game is full. Join another."; -cah.$.ErrorCode_msg['too_many_games'] = "There are too many games already in progress. Either join an existing game, or wait for one to become available."; -cah.$.ErrorCode_msg['no_session'] = "Session not detected. Make sure you have cookies enabled."; -cah.$.ErrorCode_msg['not_your_turn'] = "It is not your turn to play a card."; -cah.$.ErrorCode_msg['bad_req'] = "Bad request."; -cah.$.ErrorCode_msg['cannot_join_another_game'] = "You cannot join another game."; -cah.$.ErrorCode_msg['no_msg_spec'] = "No message specified."; -cah.$.ErrorCode_msg['not_in_that_game'] = "You are not in that game."; -cah.$.ErrorCode_msg['msg_too_long'] = "Messages cannot be longer than 200 characters."; -cah.$.ErrorCode_msg['do_not_have_card'] = "You don't have that card."; -cah.$.ErrorCode_msg['no_game_spec'] = "No game specified."; -cah.$.ErrorCode_msg['access_denied'] = "Access denied."; -cah.$.ErrorCode_msg['invalid_nick'] = "Nickname must contain only upper and lower case letters, numbers, or underscores, must be 3 to 30 characters long, and must not start with a number."; -cah.$.ErrorCode_msg['no_nick_spec'] = "No nickname specified."; -cah.$.ErrorCode_msg['nick_in_use'] = "Nickname is already in use."; -cah.$.ErrorCode_msg['not_game_host'] = "Only the game host can do that."; -cah.$.ErrorCode_msg['invalid_card'] = "Invalid card specified."; -cah.$.ErrorCode_msg['op_not_spec'] = "Operation not specified."; -cah.$.ErrorCode_msg['already_started'] = "The game has already started."; +cah.$.ErrorCode_msg['tmg'] = "There are too many games already in progress. Either join an existing game, or wait for one to become available."; +cah.$.ErrorCode_msg['ncs'] = "No card specified."; +cah.$.ErrorCode_msg['ns'] = "Session not detected. Make sure you have cookies enabled."; +cah.$.ErrorCode_msg['nr'] = "Not registered. Refresh the page."; +cah.$.ErrorCode_msg['nitg'] = "You are not in that game."; +cah.$.ErrorCode_msg['nep'] = "There are not enough players to start the game."; +cah.$.ErrorCode_msg['nyt'] = "It is not your turn to play a card."; +cah.$.ErrorCode_msg['mtl'] = "Messages cannot be longer than 200 characters."; +cah.$.ErrorCode_msg['gf'] = "That game is full. Join another."; +cah.$.ErrorCode_msg['br'] = "Bad request."; +cah.$.ErrorCode_msg['ngs'] = "No game specified."; +cah.$.ErrorCode_msg['ic'] = "Invalid card specified."; +cah.$.ErrorCode_msg['bo'] = "Invalid operation."; +cah.$.ErrorCode_msg['dnhc'] = "You don't have that card."; +cah.$.ErrorCode_msg['cjag'] = "You cannot join another game."; +cah.$.ErrorCode_msg['ons'] = "Operation not specified."; +cah.$.ErrorCode_msg['ig'] = "Invalid game specified."; +cah.$.ErrorCode_msg['nns'] = "No nickname specified."; +cah.$.ErrorCode_msg['ngh'] = "Only the game host can do that."; +cah.$.ErrorCode_msg['serr'] = "An error occured on the server."; +cah.$.ErrorCode_msg['as'] = "The game has already started."; +cah.$.ErrorCode_msg['se'] = "Your session has expired. Refresh the page."; +cah.$.ErrorCode_msg['in'] = "Nickname must contain only upper and lower case letters, numbers, or underscores, must be 3 to 30 characters long, and must not start with a number."; +cah.$.ErrorCode_msg['nms'] = "No message specified."; +cah.$.ErrorCode_msg['niu'] = "Nickname is already in use."; +cah.$.ErrorCode_msg['ad'] = "Access denied."; +cah.$.ErrorCode_msg['nj'] = "You aren't the judge."; cah.$.GameInfo = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.GameInfo.prototype.dummyForAutocomplete = undefined; -cah.$.GameInfo.HOST = "host"; -cah.$.GameInfo.STATE = "state"; -cah.$.GameInfo.PLAYERS = "players"; -cah.$.GameInfo.ID = "game_id"; +cah.$.GameInfo.HOST = "H"; +cah.$.GameInfo.STATE = "S"; +cah.$.GameInfo.PLAYERS = "P"; +cah.$.GameInfo.ID = "gid"; cah.$.GamePlayerInfo = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.GamePlayerInfo.prototype.dummyForAutocomplete = undefined; -cah.$.GamePlayerInfo.NAME = "name"; -cah.$.GamePlayerInfo.SCORE = "score"; -cah.$.GamePlayerInfo.STATUS = "status"; +cah.$.GamePlayerInfo.NAME = "N"; +cah.$.GamePlayerInfo.SCORE = "sc"; +cah.$.GamePlayerInfo.STATUS = "st"; cah.$.GamePlayerStatus = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.GamePlayerStatus.prototype.dummyForAutocomplete = undefined; -cah.$.GamePlayerStatus.HOST = "status_host"; -cah.$.GamePlayerStatus.IDLE = "status_idle"; -cah.$.GamePlayerStatus.WINNER = "status_winner"; -cah.$.GamePlayerStatus.PLAYING = "status_playing"; -cah.$.GamePlayerStatus.JUDGE = "status_judge"; -cah.$.GamePlayerStatus.JUDGING = "status_judging"; +cah.$.GamePlayerStatus.HOST = "sh"; +cah.$.GamePlayerStatus.IDLE = "si"; +cah.$.GamePlayerStatus.WINNER = "sw"; +cah.$.GamePlayerStatus.PLAYING = "sp"; +cah.$.GamePlayerStatus.JUDGE = "sj"; +cah.$.GamePlayerStatus.JUDGING = "sjj"; cah.$.GamePlayerStatus_msg = {}; -cah.$.GamePlayerStatus_msg['status_playing'] = "Playing"; -cah.$.GamePlayerStatus_msg['status_judge'] = "Card Czar"; -cah.$.GamePlayerStatus_msg['status_judging'] = "Selecting"; -cah.$.GamePlayerStatus_msg['status_host'] = "Host"; -cah.$.GamePlayerStatus_msg['status_idle'] = ""; -cah.$.GamePlayerStatus_msg['status_winner'] = "Winner!"; +cah.$.GamePlayerStatus_msg['sp'] = "Playing"; +cah.$.GamePlayerStatus_msg['sh'] = "Host"; +cah.$.GamePlayerStatus_msg['sw'] = "Winner!"; +cah.$.GamePlayerStatus_msg['sj'] = "Card Czar"; +cah.$.GamePlayerStatus_msg['sjj'] = "Selecting"; +cah.$.GamePlayerStatus_msg['si'] = ""; cah.$.GamePlayerStatus_msg_2 = {}; -cah.$.GamePlayerStatus_msg_2['status_playing'] = "Select a card to play."; -cah.$.GamePlayerStatus_msg_2['status_judge'] = "You are the Card Czar."; -cah.$.GamePlayerStatus_msg_2['status_judging'] = "Select a winning card."; -cah.$.GamePlayerStatus_msg_2['status_host'] = "Wait for players then click Start Game."; -cah.$.GamePlayerStatus_msg_2['status_idle'] = "Waiting for players..."; -cah.$.GamePlayerStatus_msg_2['status_winner'] = "You have won!"; +cah.$.GamePlayerStatus_msg_2['sp'] = "Select a card to play."; +cah.$.GamePlayerStatus_msg_2['sh'] = "Wait for players then click Start Game."; +cah.$.GamePlayerStatus_msg_2['sw'] = "You have won!"; +cah.$.GamePlayerStatus_msg_2['sj'] = "You are the Card Czar."; +cah.$.GamePlayerStatus_msg_2['sjj'] = "Select a winning card."; +cah.$.GamePlayerStatus_msg_2['si'] = "Waiting for players..."; cah.$.GameState = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.GameState.prototype.dummyForAutocomplete = undefined; -cah.$.GameState.PLAYING = "playing"; -cah.$.GameState.ROUND_OVER = "round_over"; -cah.$.GameState.LOBBY = "lobby"; -cah.$.GameState.JUDGING = "judging"; -cah.$.GameState.DEALING = "dealing"; +cah.$.GameState.PLAYING = "p"; +cah.$.GameState.ROUND_OVER = "ro"; +cah.$.GameState.LOBBY = "l"; +cah.$.GameState.JUDGING = "j"; +cah.$.GameState.DEALING = "d"; cah.$.GameState_msg = {}; -cah.$.GameState_msg['playing'] = "In Progress"; -cah.$.GameState_msg['judging'] = "In Progress"; -cah.$.GameState_msg['lobby'] = "Not Started"; -cah.$.GameState_msg['dealing'] = "In Progress"; -cah.$.GameState_msg['round_over'] = "In Progress"; +cah.$.GameState_msg['ro'] = "In Progress"; +cah.$.GameState_msg['d'] = "In Progress"; +cah.$.GameState_msg['p'] = "In Progress"; +cah.$.GameState_msg['l'] = "Not Started"; +cah.$.GameState_msg['j'] = "In Progress"; cah.$.LongPollEvent = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.LongPollEvent.prototype.dummyForAutocomplete = undefined; -cah.$.LongPollEvent.KICKED = "kicked"; -cah.$.LongPollEvent.GAME_PLAYER_LEAVE = "game_player_leave"; -cah.$.LongPollEvent.NEW_PLAYER = "new_player"; -cah.$.LongPollEvent.GAME_PLAYER_JOIN = "game_player_join"; -cah.$.LongPollEvent.GAME_LIST_REFRESH = "game_list_refresh"; -cah.$.LongPollEvent.GAME_ROUND_COMPLETE = "game_round_complete"; -cah.$.LongPollEvent.NOOP = "noop"; -cah.$.LongPollEvent.GAME_PLAYER_INFO_CHANGE = "game_player_info_change"; -cah.$.LongPollEvent.GAME_BLACK_RESHUFFLE = "game_black_reshuffle"; -cah.$.LongPollEvent.GAME_WHITE_RESHUFFLE = "game_white_reshuffle"; -cah.$.LongPollEvent.GAME_STATE_CHANGE = "game_state_change"; -cah.$.LongPollEvent.PLAYER_LEAVE = "player_leave"; -cah.$.LongPollEvent.CHAT = "chat"; -cah.$.LongPollEvent.HAND_DEAL = "hand_deal"; -cah.$.LongPollEvent.GAME_JUDGE_LEFT = "game_judge_left"; +cah.$.LongPollEvent.KICKED = "k"; +cah.$.LongPollEvent.GAME_PLAYER_LEAVE = "gpl"; +cah.$.LongPollEvent.NEW_PLAYER = "np"; +cah.$.LongPollEvent.GAME_PLAYER_JOIN = "gpj"; +cah.$.LongPollEvent.GAME_LIST_REFRESH = "glr"; +cah.$.LongPollEvent.GAME_ROUND_COMPLETE = "grc"; +cah.$.LongPollEvent.NOOP = "0"; +cah.$.LongPollEvent.GAME_PLAYER_INFO_CHANGE = "gpic"; +cah.$.LongPollEvent.GAME_BLACK_RESHUFFLE = "gbr"; +cah.$.LongPollEvent.GAME_WHITE_RESHUFFLE = "gwr"; +cah.$.LongPollEvent.GAME_STATE_CHANGE = "gsc"; +cah.$.LongPollEvent.PLAYER_LEAVE = "pl"; +cah.$.LongPollEvent.CHAT = "c"; +cah.$.LongPollEvent.HAND_DEAL = "hd"; +cah.$.LongPollEvent.GAME_JUDGE_LEFT = "gjl"; cah.$.LongPollResponse = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.LongPollResponse.prototype.dummyForAutocomplete = undefined; -cah.$.LongPollResponse.WHITE_CARDS = "white_cards"; -cah.$.LongPollResponse.GAME_ID = "game_id"; -cah.$.LongPollResponse.REASON = "reason"; -cah.$.LongPollResponse.HAND = "hand"; -cah.$.LongPollResponse.INTERMISSION = "intermission"; -cah.$.LongPollResponse.PLAYER_INFO = "player_info"; -cah.$.LongPollResponse.BLACK_CARD = "black_card"; -cah.$.LongPollResponse.WINNING_CARD = "winning_card"; -cah.$.LongPollResponse.GAME_STATE = "game_state"; -cah.$.LongPollResponse.NICKNAME = "nickname"; -cah.$.LongPollResponse.MESSAGE = "message"; -cah.$.LongPollResponse.ERROR = "error"; -cah.$.LongPollResponse.EVENT = "event"; -cah.$.LongPollResponse.FROM = "from"; -cah.$.LongPollResponse.ERROR_CODE = "error_code"; -cah.$.LongPollResponse.TIMESTAMP = "timestamp"; -cah.$.LongPollResponse.ROUND_WINNER = "round_winner"; +cah.$.LongPollResponse.WHITE_CARDS = "wc"; +cah.$.LongPollResponse.GAME_ID = "gid"; +cah.$.LongPollResponse.REASON = "qr"; +cah.$.LongPollResponse.HAND = "h"; +cah.$.LongPollResponse.INTERMISSION = "i"; +cah.$.LongPollResponse.PLAYER_INFO = "pi"; +cah.$.LongPollResponse.BLACK_CARD = "bc"; +cah.$.LongPollResponse.WINNING_CARD = "WC"; +cah.$.LongPollResponse.GAME_STATE = "gs"; +cah.$.LongPollResponse.NICKNAME = "n"; +cah.$.LongPollResponse.MESSAGE = "m"; +cah.$.LongPollResponse.ERROR = "e"; +cah.$.LongPollResponse.EVENT = "E"; +cah.$.LongPollResponse.FROM = "f"; +cah.$.LongPollResponse.ERROR_CODE = "ec"; +cah.$.LongPollResponse.TIMESTAMP = "ts"; +cah.$.LongPollResponse.ROUND_WINNER = "rw"; cah.$.ReconnectNextAction = function() { // Dummy constructor to make Eclipse auto-complete. @@ -242,6 +242,6 @@ cah.$.WhiteCardData = function() { // Dummy constructor to make Eclipse auto-complete. }; cah.$.WhiteCardData.prototype.dummyForAutocomplete = undefined; -cah.$.WhiteCardData.TEXT = "text"; -cah.$.WhiteCardData.ID = "card_id"; +cah.$.WhiteCardData.TEXT = "T"; +cah.$.WhiteCardData.ID = "cid"; diff --git a/src/net/socialgamer/cah/Constants.java b/src/net/socialgamer/cah/Constants.java index b670704..6dd16e0 100644 --- a/src/net/socialgamer/cah/Constants.java +++ b/src/net/socialgamer/cah/Constants.java @@ -81,15 +81,15 @@ public class Constants { /** * The client was kicked by the server administrator. */ - KICKED("kicked"), + KICKED("k"), /** * The user clicked the "log out" button. */ - MANUAL("manual"), + MANUAL("man"), /** * The client failed to make any queries within the timeout window. */ - PING_TIMEOUT("ping_timeout"); + PING_TIMEOUT("pt"); private final String reason; @@ -105,6 +105,8 @@ public class Constants { /** * The next thing the client should do during reconnect phase. + * + * Leaving these as longer strings as they are only used once per client. */ public enum ReconnectNextAction { /** @@ -133,27 +135,27 @@ public class Constants { * Valid client request operations. */ public enum AjaxOperation { - ADMIN_SET_VERBOSE_LOG("set_verbose_log"), - CHAT("chat"), - CREATE_GAME("create_game"), - FIRST_LOAD("firstload"), - GAME_LIST("game_list"), + ADMIN_SET_VERBOSE_LOG("svl"), + CHAT("c"), + CREATE_GAME("cg"), + FIRST_LOAD("fl"), + GAME_LIST("ggl"), /** * Get all cards for a particular game: black, hand, and round white cards. */ - GET_CARDS("get_cards"), - GET_GAME_INFO("get_game_info"), - JOIN_GAME("join_game"), - JUDGE_SELECT("judge_select"), - LEAVE_GAME("leave_game"), - LOG_OUT("logout"), + GET_CARDS("gc"), + GET_GAME_INFO("ggi"), + JOIN_GAME("jg"), + JUDGE_SELECT("js"), + LEAVE_GAME("lg"), + LOG_OUT("lo"), /** * Get the names of all clients connected to the server. */ - NAMES("get_names"), - PLAY_CARD("play_card"), - REGISTER("register"), - START_GAME("start_game"); + NAMES("gn"), + PLAY_CARD("pc"), + REGISTER("r"), + START_GAME("sg"); private final String op; @@ -171,12 +173,12 @@ public class Constants { * Parameters for client requests. */ public enum AjaxRequest { - CARD_ID("card_id"), - GAME_ID("game_id"), - MESSAGE("message"), - NICKNAME("nickname"), - OP("op"), - SERIAL("serial"); + CARD_ID("cid"), + GAME_ID("gid"), + MESSAGE("m"), + NICKNAME("n"), + OP("o"), + SERIAL("s"); private final String field; @@ -194,32 +196,32 @@ public class Constants { * Keys for client request responses. */ public enum AjaxResponse implements ReturnableData { - BLACK_CARD("black_card"), + BLACK_CARD("bc"), @DuplicationAllowed CARD_ID(AjaxRequest.CARD_ID), - ERROR("error"), - ERROR_CODE("error_code"), + ERROR("e"), + ERROR_CODE("ec"), @DuplicationAllowed GAME_ID(AjaxRequest.GAME_ID), - GAME_INFO("game_info"), - GAMES("games"), - HAND("hand"), + GAME_INFO("gi"), + GAMES("gl"), + HAND("h"), /** * Whether this client is reconnecting or not. */ - IN_PROGRESS("in_progress"), - MAX_GAMES("max_games"), - NAMES("names"), + IN_PROGRESS("ip"), + MAX_GAMES("mg"), + NAMES("nl"), /** - * Next thing that should be done in reconnect process. + * Next thing that should be done in reconnect process. Used once, long string OK. */ NEXT("next"), @DuplicationAllowed NICKNAME(AjaxRequest.NICKNAME), - PLAYER_INFO("player_info"), + PLAYER_INFO("pi"), @DuplicationAllowed SERIAL(AjaxRequest.SERIAL), - WHITE_CARDS("white_cards"); + WHITE_CARDS("wc"); private final String field; @@ -241,41 +243,41 @@ public class Constants { * Client request and long poll response errors. */ public enum ErrorCode implements Localizable { - ACCESS_DENIED("access_denied", "Access denied."), - ALREADY_STARTED("already_started", "The game has already started."), - BAD_OP("bad_op", "Invalid operation."), - BAD_REQUEST("bad_req", "Bad request."), - CANNOT_JOIN_ANOTHER_GAME("cannot_join_another_game", "You cannot join another game."), - DO_NOT_HAVE_CARD("do_not_have_card", "You don't have that card."), - GAME_FULL("game_full", "That game is full. Join another."), - INVALID_CARD("invalid_card", "Invalid card specified."), - INVALID_GAME("invalid_game", "Invalid game specified."), + ACCESS_DENIED("ad", "Access denied."), + ALREADY_STARTED("as", "The game has already started."), + BAD_OP("bo", "Invalid operation."), + BAD_REQUEST("br", "Bad request."), + CANNOT_JOIN_ANOTHER_GAME("cjag", "You cannot join another game."), + DO_NOT_HAVE_CARD("dnhc", "You don't have that card."), + GAME_FULL("gf", "That game is full. Join another."), + INVALID_CARD("ic", "Invalid card specified."), + INVALID_GAME("ig", "Invalid game specified."), /** * TODO this probably should be pulled in from a static inside the RegisterHandler. */ - INVALID_NICK("invalid_nick", "Nickname must contain only upper and lower case letters, " + + INVALID_NICK("in", "Nickname must contain only upper and lower case letters, " + "numbers, or underscores, must be 3 to 30 characters long, and must not start with a " + "number."), /** * TODO this probably should be pulled in from a static inside the ChatHandler. */ - MESSAGE_TOO_LONG("msg_too_long", "Messages cannot be longer than 200 characters."), - NICK_IN_USE("nick_in_use", "Nickname is already in use."), - NO_CARD_SPECIFIED("no_card_spec", "No card specified."), - NO_GAME_SPECIFIED("no_game_spec", "No game specified."), - NO_MSG_SPECIFIED("no_msg_spec", "No message specified."), - NO_NICK_SPECIFIED("no_nick_spec", "No nickname specified."), - NO_SESSION("no_session", "Session not detected. Make sure you have cookies enabled."), - NOT_ENOUGH_PLAYERS("not_enough_players", "There are not enough players to start the game."), - NOT_GAME_HOST("not_game_host", "Only the game host can do that."), - NOT_IN_THAT_GAME("not_in_that_game", "You are not in that game."), - NOT_JUDGE("not_judge", "You aren't the judge."), - NOT_REGISTERED("not_registered", "Not registered. Refresh the page."), - NOT_YOUR_TURN("not_your_turn", "It is not your turn to play a card."), - OP_NOT_SPECIFIED("op_not_spec", "Operation not specified."), - SERVER_ERROR("server_error", "An error occured on the server."), - SESSION_EXPIRED("session_expired", "Your session has expired. Refresh the page."), - TOO_MANY_GAMES("too_many_games", "There are too many games already in progress. Either join " + + MESSAGE_TOO_LONG("mtl", "Messages cannot be longer than 200 characters."), + NICK_IN_USE("niu", "Nickname is already in use."), + NO_CARD_SPECIFIED("ncs", "No card specified."), + NO_GAME_SPECIFIED("ngs", "No game specified."), + NO_MSG_SPECIFIED("nms", "No message specified."), + NO_NICK_SPECIFIED("nns", "No nickname specified."), + NO_SESSION("ns", "Session not detected. Make sure you have cookies enabled."), + NOT_ENOUGH_PLAYERS("nep", "There are not enough players to start the game."), + NOT_GAME_HOST("ngh", "Only the game host can do that."), + NOT_IN_THAT_GAME("nitg", "You are not in that game."), + NOT_JUDGE("nj", "You aren't the judge."), + NOT_REGISTERED("nr", "Not registered. Refresh the page."), + NOT_YOUR_TURN("nyt", "It is not your turn to play a card."), + OP_NOT_SPECIFIED("ons", "Operation not specified."), + SERVER_ERROR("serr", "An error occured on the server."), + SESSION_EXPIRED("se", "Your session has expired. Refresh the page."), + TOO_MANY_GAMES("tmg", "There are too many games already in progress. Either join " + "an existing game, or wait for one to become available."); private final String code; @@ -309,25 +311,25 @@ public class Constants { public enum LongPollEvent { @DuplicationAllowed CHAT(AjaxOperation.CHAT), - GAME_BLACK_RESHUFFLE("game_black_reshuffle"), - GAME_JUDGE_LEFT("game_judge_left"), - GAME_LIST_REFRESH("game_list_refresh"), - GAME_PLAYER_INFO_CHANGE("game_player_info_change"), - GAME_PLAYER_JOIN("game_player_join"), - GAME_PLAYER_LEAVE("game_player_leave"), - GAME_ROUND_COMPLETE("game_round_complete"), - GAME_STATE_CHANGE("game_state_change"), - GAME_WHITE_RESHUFFLE("game_white_reshuffle"), - HAND_DEAL("hand_deal"), + GAME_BLACK_RESHUFFLE("gbr"), + GAME_JUDGE_LEFT("gjl"), + GAME_LIST_REFRESH("glr"), + GAME_PLAYER_INFO_CHANGE("gpic"), + GAME_PLAYER_JOIN("gpj"), + GAME_PLAYER_LEAVE("gpl"), + GAME_ROUND_COMPLETE("grc"), + GAME_STATE_CHANGE("gsc"), + GAME_WHITE_RESHUFFLE("gwr"), + HAND_DEAL("hd"), @DuplicationAllowed KICKED(DisconnectReason.KICKED), - NEW_PLAYER("new_player"), + NEW_PLAYER("np"), /** * There has been no other action to inform the client about in a certain timeframe, so inform * the client that we have nothing to inform them so the client doesn't think we went away. */ - NOOP("noop"), - PLAYER_LEAVE("player_leave"); + NOOP("0"), + PLAYER_LEAVE("pl"); private final String event; @@ -355,20 +357,20 @@ public class Constants { ERROR(AjaxResponse.ERROR), @DuplicationAllowed ERROR_CODE(AjaxResponse.ERROR_CODE), - EVENT("event"), + EVENT("E"), /** * Player a chat message is from. */ - FROM("from"), + FROM("f"), @DuplicationAllowed GAME_ID(AjaxResponse.GAME_ID), - GAME_STATE("game_state"), + GAME_STATE("gs"), @DuplicationAllowed HAND(AjaxResponse.HAND), /** * The delay until the next game round begins. */ - INTERMISSION("intermission"), + INTERMISSION("i"), @DuplicationAllowed MESSAGE(AjaxRequest.MESSAGE), @DuplicationAllowed @@ -378,12 +380,12 @@ public class Constants { /** * Reason why a player disconnected. */ - REASON("reason"), - ROUND_WINNER("round_winner"), - TIMESTAMP("timestamp"), + REASON("qr"), + ROUND_WINNER("rw"), + TIMESTAMP("ts"), @DuplicationAllowed WHITE_CARDS(AjaxResponse.WHITE_CARDS), - WINNING_CARD("winning_card"); + WINNING_CARD("WC"); private final String field; @@ -407,7 +409,7 @@ public class Constants { public enum WhiteCardData { @DuplicationAllowed ID(AjaxRequest.CARD_ID), - TEXT("text"); + TEXT("T"); private final String key; @@ -429,10 +431,10 @@ public class Constants { * Data fields for black cards. */ public enum BlackCardData { - DRAW("draw"), + DRAW("D"), @DuplicationAllowed ID(WhiteCardData.ID), - PICK("pick"), + PICK("PK"), @DuplicationAllowed TEXT(WhiteCardData.TEXT); @@ -456,11 +458,11 @@ public class Constants { * A game's current state. */ public enum GameState implements Localizable { - DEALING("dealing", "In Progress"), - JUDGING("judging", "In Progress"), - LOBBY("lobby", "Not Started"), - PLAYING("playing", "In Progress"), - ROUND_OVER("round_over", "In Progress"); + DEALING("d", "In Progress"), + JUDGING("j", "In Progress"), + LOBBY("l", "Not Started"), + PLAYING("p", "In Progress"), + ROUND_OVER("ro", "In Progress"); private final String state; private final String message; @@ -485,11 +487,11 @@ public class Constants { * Fields for information about a game. */ public enum GameInfo { - HOST("host"), + HOST("H"), @DuplicationAllowed ID(AjaxRequest.GAME_ID), - PLAYERS("players"), - STATE("state"); + PLAYERS("P"), + STATE("S"); private final String key; @@ -511,9 +513,9 @@ public class Constants { * Keys for the information about players in a game. */ public enum GamePlayerInfo { - NAME("name"), - SCORE("score"), - STATUS("status"); + NAME("N"), + SCORE("sc"), + STATUS("st"); private final String key; @@ -533,12 +535,12 @@ public class Constants { * do. */ public enum GamePlayerStatus implements DoubleLocalizable { - HOST("status_host", "Host", "Wait for players then click Start Game."), - IDLE("status_idle", "", "Waiting for players..."), - JUDGE("status_judge", "Card Czar", "You are the Card Czar."), - JUDGING("status_judging", "Selecting", "Select a winning card."), - PLAYING("status_playing", "Playing", "Select a card to play."), - WINNER("status_winner", "Winner!", "You have won!"); + HOST("sh", "Host", "Wait for players then click Start Game."), + IDLE("si", "", "Waiting for players..."), + JUDGE("sj", "Card Czar", "You are the Card Czar."), + JUDGING("sjj", "Selecting", "Select a winning card."), + PLAYING("sp", "Playing", "Select a card to play."), + WINNER("sw", "Winner!", "You have won!"); private final String status; private final String message;