This commit is contained in:
Lorenzo Iovino 2017-07-14 01:43:06 +02:00
parent afbd45f51e
commit 44a9e43cd4
6 changed files with 318 additions and 251 deletions

418
.idea/workspace.xml generated
View file

@ -8,6 +8,10 @@
<component name="ChangeListManager">
<list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/notificationServer.log" afterPath="$PROJECT_DIR$/notificationServer.log" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
@ -30,61 +34,35 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file leaf-file-name="Config.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
<file leaf-file-name="ReceiveWordsService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="27" column="29" lean-forward="true" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
<state relative-caret-position="714">
<caret line="43" column="36" lean-forward="true" selection-start-line="43" selection-start-column="36" selection-end-line="43" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<marker date="1499983825751" expanded="true" signature="346:353" ph="/**...*/" />
<marker date="1499983825751" expanded="true" signature="1553:1700" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MessageDispatcher.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="159" column="15" lean-forward="false" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MatchTimeout.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MatchTimeout.java">
<file leaf-file-name="MessageService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="10" column="41" lean-forward="false" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" column="63" lean-forward="true" selection-start-line="10" selection-start-column="63" selection-end-line="10" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="App.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Server.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="32" column="53" lean-forward="true" selection-start-line="32" selection-start-column="53" selection-end-line="32" selection-end-column="53" />
<state relative-caret-position="850">
<caret line="56" column="20" lean-forward="true" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -92,21 +70,76 @@
</provider>
</entry>
</file>
<file leaf-file-name="INotificationServer.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Commons/src/interfaces/INotificationServer.java">
<file leaf-file-name="Config.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="5" column="0" lean-forward="false" selection-start-line="5" selection-start-column="0" selection-end-line="8" selection-end-column="3" />
<state relative-caret-position="525">
<caret line="25" column="36" lean-forward="false" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WaitForPlayers.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java">
<file leaf-file-name="NotificationService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="47" column="0" lean-forward="true" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
<state relative-caret-position="661">
<caret line="51" column="9" lean-forward="false" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SessionsService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/SessionsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SendInvitations.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendInvitations.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="14" column="11" lean-forward="false" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="JedisService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="21" column="63" lean-forward="false" selection-start-line="21" selection-start-column="63" selection-end-line="21" selection-end-column="63" />
<folding>
<element signature="e#412#413#0" expanded="true" />
<element signature="e#488#489#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AuthService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountsService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-182">
<caret line="26" column="39" lean-forward="true" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
<folding />
</state>
</provider>
@ -123,11 +156,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>waitingfor</find>
<find>waitingfo</find>
<find>waitingf</find>
<find>waiting</find>
<find>waiting for</find>
<find>is</find>
<find>i</find>
<find>gam</find>
@ -153,6 +181,11 @@
<find>Naming.re</find>
<find>Naming.r</find>
<find>Naming.</find>
<find>ma</find>
<find>match</find>
<find>matchNot</find>
<find>matchNotA</find>
<find>matchNotAv</find>
</findStrings>
<dirStrings>
<dir>C:\Users\loke\TextTwist\out\production</dir>
@ -305,14 +338,12 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/servers/ThreadProxy.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendScore.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Dictionary.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/servers/ProxyDispatcher.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ReceiveWords.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ReceiveWordsService.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/services/AuthService.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/controllers/HomeController.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/SendWords.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java" />
@ -329,10 +360,7 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/ComputeHighscores.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/CheckOnlineUsers.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/SessionsService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" />
<option value="$PROJECT_DIR$/Commons/src/interfaces/INotificationServer.java" />
<option value="$PROJECT_DIR$/Commons/src/constants/Config.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinTimeout.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/tasks/WaitForPlayers.java" />
@ -342,6 +370,11 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/BootstrapService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java" />
<option value="$PROJECT_DIR$/Commons/src/constants/Config.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java" />
</list>
</option>
</component>
@ -907,7 +940,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.Server">
<component name="RunManager" selected="Application.Client">
<configuration default="false" name="Server" type="Application" factoryName="Application" temporary="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.texttwist.server.Main" />
@ -1327,8 +1360,8 @@
</list>
<recent_temporary>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="Application.Server" />
<item index="1" class="java.lang.String" itemvalue="Application.Client" />
<item index="0" class="java.lang.String" itemvalue="Application.Client" />
<item index="1" class="java.lang.String" itemvalue="Application.Server" />
<item index="2" class="java.lang.String" itemvalue="Application.Server" />
<item index="3" class="java.lang.String" itemvalue="Application.Server" />
</list>
@ -1391,15 +1424,16 @@
<workItem from="1499865254521" duration="23162000" />
<workItem from="1499948531070" duration="596000" />
<workItem from="1499949143188" duration="13169000" />
<workItem from="1499981493583" duration="6440000" />
<workItem from="1499981493583" duration="7878000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="448461000" />
<option name="totallyTimeSpent" value="449899000" />
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -1416,7 +1450,7 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36614582" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2171875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32821077" sideWeight="0.49764705" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@ -1522,26 +1556,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendInvitations.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="25" column="9" lean-forward="false" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinMatch.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="37" column="9" lean-forward="true" selection-start-line="37" selection-start-column="9" selection-end-line="37" selection-end-column="9" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/GenerateLetters.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
@ -1580,73 +1594,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/SessionsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546">
<caret line="34" column="0" lean-forward="false" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="756">
<caret line="36" column="15" lean-forward="false" selection-start-line="36" selection-start-column="15" selection-end-line="36" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
<marker date="1499983825751" expanded="true" signature="346:353" ph="/**...*/" />
<marker date="1499983825751" expanded="true" signature="1553:1700" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="33" column="55" lean-forward="false" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="21" column="63" lean-forward="false" selection-start-line="21" selection-start-column="63" selection-end-line="21" selection-end-column="63" />
<folding>
<element signature="e#412#413#0" expanded="true" />
<element signature="e#488#489#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441">
<caret line="21" column="3" lean-forward="true" selection-start-line="21" selection-start-column="3" selection-end-line="21" selection-end-column="3" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/models/Match.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
@ -1757,17 +1704,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinTimeout.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
<folding>
<element signature="e#349#350#0" expanded="true" />
<element signature="e#383#384#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Commons/src/models/Message.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
@ -1776,14 +1712,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/services/GameService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
@ -1800,14 +1728,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="27" column="29" lean-forward="true" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/MatchTimeout.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
@ -1848,14 +1768,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/BootstrapService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
@ -1882,6 +1794,124 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinTimeout.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="12" column="29" lean-forward="true" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
<folding>
<element signature="e#349#350#0" expanded="true" />
<element signature="e#383#384#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/App.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="39" column="42" lean-forward="true" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/JoinMatch.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="26" column="32" lean-forward="true" selection-start-line="26" selection-start-column="32" selection-end-line="26" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Commons/src/constants/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="25" column="36" lean-forward="false" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/proxies/MessageDispatcher.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="159" column="15" lean-forward="false" selection-start-line="159" selection-start-column="15" selection-end-line="159" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AccountsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-182">
<caret line="26" column="39" lean-forward="true" selection-start-line="26" selection-start-column="39" selection-end-line="26" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/AuthService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/JedisService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="21" column="63" lean-forward="false" selection-start-line="21" selection-start-column="63" selection-end-line="21" selection-end-column="63" />
<folding>
<element signature="e#412#413#0" expanded="true" />
<element signature="e#488#489#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/MessageService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="56" column="20" lean-forward="true" selection-start-line="56" selection-start-column="20" selection-end-line="56" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/NotificationService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="51" column="9" lean-forward="false" selection-start-line="51" selection-start-column="9" selection-end-line="51" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/ReceiveWordsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="43" column="36" lean-forward="true" selection-start-line="43" selection-start-column="36" selection-end-line="43" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<marker date="1499983825751" expanded="true" signature="346:353" ph="/**...*/" />
<marker date="1499983825751" expanded="true" signature="1553:1700" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/services/SessionsService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="45" column="28" lean-forward="true" selection-start-line="45" selection-start-column="28" selection-end-line="45" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/tasks/SendInvitations.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="14" column="11" lean-forward="false" selection-start-line="14" selection-start-column="11" selection-end-line="14" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>