From 8eab4d97c14eda5f3f0d8548fe62924af30c5fe3 Mon Sep 17 00:00:00 2001 From: Lorenzo Iovino Date: Sat, 15 Jul 2017 04:32:35 +0200 Subject: [PATCH] up --- .idea/workspace.xml | 1055 +- .../controllers/MatchRequestController.java | 4 +- .../controllers/MatchSetupController.java | 5 +- .../client/pages/MatchSetupPage.java | 2 +- .../client/services/GameService.java | 58 +- .../services/NotificationClientService.java | 3 +- .../texttwist/client/tasks/BeginMatch.java | 52 + .../com/texttwist/client/tasks/JoinMatch.java | 47 + .../client/tasks/WaitForPlayers.java | 1 + .../src/interfaces/INotificationServer.java | 2 + .../AccountsManager.java} | 15 +- .../SessionsManager.java} | 11 +- .../com/texttwist/server/models/Match.java | 4 +- .../server/proxies/MessageDispatcher.java | 6 +- .../server/services/AuthService.java | 12 +- .../server/services/ReceiveWordsService.java | 3 +- .../server/tasks/CheckOnlineUsers.java | 5 +- .../server/tasks/ComputeHighscores.java | 10 +- .../texttwist/server/tasks/ComputeScore.java | 4 +- .../{JoinTimeout.java => TimeoutJoin.java} | 4 +- .../{MatchTimeout.java => TimeoutMatch.java} | 4 +- client_1.log | 9134 ----------------- notificationServer.log | 2068 ---- 23 files changed, 714 insertions(+), 11795 deletions(-) create mode 100644 Client/src/com/texttwist/client/tasks/BeginMatch.java create mode 100644 Client/src/com/texttwist/client/tasks/JoinMatch.java rename Server/src/com/texttwist/server/{services/AccountsService.java => managers/AccountsManager.java} (82%) rename Server/src/com/texttwist/server/{services/SessionsService.java => managers/SessionsManager.java} (84%) rename Server/src/com/texttwist/server/tasks/{JoinTimeout.java => TimeoutJoin.java} (89%) rename Server/src/com/texttwist/server/tasks/{MatchTimeout.java => TimeoutMatch.java} (88%) delete mode 100644 client_1.log delete mode 100644 notificationServer.log diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d572e78..27c0759 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,12 +7,29 @@ + + + + + + + + + + + + + + + + - - - - + + + + +