loke/texttwist
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added TTSearchBar functionality for add and remove users

Browse source
This commit is contained in:
Lorenzo Iovino 2017-06-18 21:14:11 +02:00
parent 48705f7e76
commit eb1754e63e
6 changed files with 417 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

477
.idea/workspace.xml generated
View file

@ -5,33 +5,12 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment=""> <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Commons/src/models/Account.java" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupController.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Commons/src/models/User.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/AccountsManager.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/Auth.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/SessionsManager.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadProxy.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadWorker.java" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/auth/TTAuth.java" afterPath="" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/App.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/App.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Commons/src/interfaces/ITTAuth.java" afterPath="$PROJECT_DIR$/Commons/src/interfaces/IAuth.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Commons/src/models/TTAccount.java" afterPath="$PROJECT_DIR$/Commons/src/models/Session.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Commons/src/models/TTResponse.java" afterPath="$PROJECT_DIR$/Commons/src/models/Response.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Commons/src/utilities/TTLogger.java" afterPath="$PROJECT_DIR$/Commons/src/utilities/Logger.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/components/TTServer.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server.log" afterPath="$PROJECT_DIR$/server.log" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/RegisterController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java" afterPath="$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -49,81 +28,31 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file leaf-file-name="Auth.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/Auth.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152"> <state relative-caret-position="342">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> <caret line="64" column="25" lean-forward="true" selection-start-line="52" selection-start-column="21" selection-end-line="64" selection-end-column="25" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false"> <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/Main.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="189">
<caret line="7" column="19" lean-forward="true" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" /> <caret line="14" column="5" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="SessionsManager.java" pinned="false" current-in-tab="false"> <file leaf-file-name="MatchSetupController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/SessionsManager.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#525#526#0" expanded="true" />
<element signature="e#563#564#0" expanded="true" />
<element signature="e#789#790#0" expanded="true" />
<element signature="e#849#850#0" expanded="true" />
<element signature="e#1242#1243#0" expanded="true" />
<element signature="e#1280#1281#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Logger.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Commons/src/utilities/Logger.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccountsManager.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/AccountsManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="433">
<caret line="41" column="19" lean-forward="true" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#546#547#0" expanded="true" />
<element signature="e#600#601#0" expanded="true" />
<element signature="e#1207#1208#0" expanded="true" />
<element signature="e#1245#1246#0" expanded="true" />
</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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168"> <state relative-caret-position="168">
<caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" /> <caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -131,42 +60,78 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="GameServer.java" pinned="false" current-in-tab="true"> <file leaf-file-name="MatchSetup.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="42">
<caret line="45" column="33" lean-forward="true" selection-start-line="45" selection-start-column="33" selection-end-line="45" selection-end-column="33" /> <caret line="75" column="23" lean-forward="true" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MenuController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TTSearchBar.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-129">
<caret line="18" column="18" lean-forward="true" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#564#572#0" expanded="true" />
<element signature="e#991#992#0" expanded="true" /> <element signature="e#2885#3329#0" expanded="true" />
<element signature="e#1029#1030#0" expanded="true" /> <element signature="e#3328#3329#0" expanded="true" />
<element signature="e#3370#3840#0" expanded="true" />
<element signature="e#3839#3840#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ThreadProxy.java" pinned="false" current-in-tab="false"> <file leaf-file-name="TTScrollList.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadProxy.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291"> <state relative-caret-position="84">
<caret line="20" column="17" lean-forward="true" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="17" /> <caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
<folding> <folding />
<element signature="imports" expanded="true" />
<element signature="e#408#409#0" expanded="true" />
<element signature="e#446#447#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ThreadWorker.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Highscores.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadWorker.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270"> <state relative-caret-position="-444">
<caret line="23" column="55" lean-forward="false" selection-start-line="23" selection-start-column="55" selection-end-line="23" selection-end-column="55" /> <caret line="43" column="5" lean-forward="true" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
<folding> <folding />
<element signature="imports" expanded="true" /> </state>
</folding> </provider>
</entry>
</file>
<file leaf-file-name="TTContainer.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-862">
<caret line="48" column="29" lean-forward="true" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -192,7 +157,6 @@
<find>system.ou</find> <find>system.ou</find>
<find>system.out</find> <find>system.out</find>
<find>getRandomPo</find> <find>getRandomPo</find>
<find>T</find>
<find>TTREs</find> <find>TTREs</find>
<find>TTREsp</find> <find>TTREsp</find>
<find>Log</find> <find>Log</find>
@ -200,8 +164,16 @@
<find>Logger.wr</find> <find>Logger.wr</find>
<find>L</find> <find>L</find>
<find>LOGGE</find> <find>LOGGE</find>
<find>LOGGER:</find>
<find>admin</find> <find>admin</find>
<find>LOGGER:</find>
<find>T</find>
<find>TTInp</find>
<find>TTInpu</find>
<find>TTInputB</find>
<find>TTInput</find>
<find>TTInputF</find>
<find>controller</find>
<find>adduser</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@ -215,12 +187,8 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Dialog.java" /> <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Dialog.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/Dialog.java" /> <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/Dialog.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" /> <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" /> <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java" /> <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeManager.java" />
@ -266,6 +234,10 @@
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/Server.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadProxy.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/ThreadProxy.java" />
<option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java" /> <option value="$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
<option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupController.java" />
</list> </list>
</option> </option>
</component> </component>
@ -615,7 +587,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Application.Server"> <component name="RunManager" selected="Application.Client">
<configuration default="false" name="Server" type="Application" factoryName="Application" temporary="true"> <configuration default="false" name="Server" type="Application" factoryName="Application" temporary="true">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.texttwist.server.Main" /> <option name="MAIN_CLASS_NAME" value="com.texttwist.server.Main" />
@ -1030,8 +1002,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list size="4"> <list size="4">
<item index="0" class="java.lang.String" itemvalue="Application.Server" /> <item index="0" class="java.lang.String" itemvalue="Application.Client" />
<item index="1" 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="2" class="java.lang.String" itemvalue="Application.Server" />
<item index="3" class="java.lang.String" itemvalue="Application.Server" /> <item index="3" class="java.lang.String" itemvalue="Application.Server" />
</list> </list>
@ -1058,12 +1030,12 @@
<workItem from="1497552318772" duration="3068000" /> <workItem from="1497552318772" duration="3068000" />
<workItem from="1497562855680" duration="194000" /> <workItem from="1497562855680" duration="194000" />
<workItem from="1497704337642" duration="11601000" /> <workItem from="1497704337642" duration="11601000" />
<workItem from="1497770236595" duration="17712000" /> <workItem from="1497770236595" duration="22155000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="120541000" /> <option name="totallyTimeSpent" value="124984000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-1709" y="-107" width="1718" height="928" extended-state="6" /> <frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
@ -1079,7 +1051,7 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5164706" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5164706" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" 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="Maven Projects" 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="Version Control" 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="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" 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="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36915296" sideWeight="0.6982353" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36915296" sideWeight="0.6982353" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Properties" 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="Properties" 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="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="7" side_tool="false" content_ui="tabs" /> <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="7" 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="2" 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="2" side_tool="false" content_ui="tabs" />
@ -1118,21 +1090,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/untitled/src/asd/asd.java" />
<entry file="file://$PROJECT_DIR$/TextTwist.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="11" column="9" lean-forward="false" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/Client.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" column="47" lean-forward="false" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/Server.iml"> <entry file="file://$PROJECT_DIR$/Server/Server.iml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="147">
@ -1203,14 +1160,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="23" column="33" lean-forward="false" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
@ -1235,14 +1184,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="334">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTDialog.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1638"> <state relative-caret-position="1638">
@ -1258,19 +1199,11 @@
<state relative-caret-position="126"> <state relative-caret-position="126">
<caret line="9" column="39" lean-forward="false" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" /> <caret line="9" column="39" lean-forward="false" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1260">
<caret line="66" column="32" lean-forward="false" selection-start-line="66" selection-start-column="32" selection-end-line="66" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273"> <state relative-caret-position="273">
@ -1297,48 +1230,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-252">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="315">
@ -1375,30 +1266,12 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="210">
<caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" /> <caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java"> <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/SessionService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="252">
@ -1410,16 +1283,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="16" column="37" lean-forward="true" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="37" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java"> <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/ArrayList.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207"> <state relative-caret-position="207">
@ -1436,14 +1299,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-153">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Commons/src/models/Session.java"> <entry file="file://$PROJECT_DIR$/Commons/src/models/Session.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126"> <state relative-caret-position="126">
@ -1457,7 +1312,7 @@
<state relative-caret-position="246"> <state relative-caret-position="246">
<caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" /> <caret line="50" column="0" lean-forward="false" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1517,7 +1372,7 @@
<state relative-caret-position="147"> <state relative-caret-position="147">
<caret line="7" column="19" lean-forward="true" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" /> <caret line="7" column="19" lean-forward="true" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1527,7 +1382,7 @@
<state relative-caret-position="168"> <state relative-caret-position="168">
<caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" /> <caret line="25" column="36" lean-forward="true" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1555,10 +1410,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="54" column="29" lean-forward="true" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java"> <entry file="file://$PROJECT_DIR$/Server/src/com/texttwist/server/components/GameServer.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="2079">
<caret line="45" column="33" lean-forward="true" selection-start-line="45" selection-start-column="33" selection-end-line="45" selection-end-column="33" /> <caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#991#992#0" expanded="true" /> <element signature="e#991#992#0" expanded="true" />
@ -1567,6 +1430,126 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1050">
<caret line="15" column="0" lean-forward="true" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/AuthService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="123">
<caret line="27" column="52" lean-forward="true" selection-start-line="27" selection-start-column="52" selection-end-line="27" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-189">
<caret line="27" column="34" lean-forward="true" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="28" column="22" lean-forward="true" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-444">
<caret line="43" column="5" lean-forward="true" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="13" column="25" lean-forward="true" selection-start-line="13" selection-start-column="25" selection-end-line="13" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/HomeController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="14" column="5" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MenuController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="19" column="29" lean-forward="true" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-862">
<caret line="48" column="29" lean-forward="true" selection-start-line="48" selection-start-column="29" selection-end-line="48" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="64" column="25" lean-forward="true" selection-start-line="52" selection-start-column="21" selection-end-line="64" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-129">
<caret line="18" column="18" lean-forward="true" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
<folding>
<element signature="e#564#572#0" expanded="true" />
<element signature="e#2885#3329#0" expanded="true" />
<element signature="e#3328#3329#0" expanded="true" />
<element signature="e#3370#3840#0" expanded="true" />
<element signature="e#3839#3840#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="42">
<caret line="75" column="23" lean-forward="true" selection-start-line="75" selection-start-column="23" selection-end-line="75" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetupController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

49
Client/src/com/texttwist/client/pages/MatchSetup.java
View file

@ -2,6 +2,7 @@ package com.texttwist.client.pages;
import com.texttwist.client.constants.Palette; import com.texttwist.client.constants.Palette;
import com.texttwist.client.ui.*; import com.texttwist.client.ui.*;
import models.Response;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -14,16 +15,15 @@ import java.util.concurrent.Callable;
public class MatchSetup extends Page{ public class MatchSetup extends Page{
public TTContainer matchSetupContainer; public TTContainer matchSetupContainer;
MatchSetup(JFrame window) throws IOException { public MatchSetupController matchSetupController;
MatchSetup(JFrame window) throws Exception {
super(window); super(window);
matchSetupController = new MatchSetupController();
createUIComponents(); createUIComponents();
window.setVisible(true); window.setVisible(true);
} }
private Callable addUserToInvitationList(){
return null;
}
//TODO Spostare i metodi di fetches nella classe MatchSetupService per separare MVC //TODO Spostare i metodi di fetches nella classe MatchSetupService per separare MVC
private DefaultListModel fetchUsers(){ private DefaultListModel fetchUsers(){
DefaultListModel<String> usersList = new DefaultListModel<String>(); DefaultListModel<String> usersList = new DefaultListModel<String>();
@ -48,7 +48,7 @@ public class MatchSetup extends Page{
} }
@Override @Override
public void createUIComponents() throws IOException { public void createUIComponents() throws Exception {
addLogo(root); addLogo(root);
matchSetupContainer = new TTContainer( matchSetupContainer = new TTContainer(
@ -66,34 +66,10 @@ public class MatchSetup extends Page{
null, null,
matchSetupContainer); matchSetupContainer);
TTLabel playerFinder_flavourText = new TTLabel(
new Point(20,40),
new Dimension(350,50),
"<html>Search players to invite...</html>",
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
null,
matchSetupContainer);
TTSearchBar searchUserBar = new TTSearchBar( TTSearchBar searchUserBar = new TTSearchBar(
new Point(20, 80), new Point(20, 80),
new Dimension(250, 40), new Dimension(250, 40),
"Username", "Username",
new DefaultListModel(),
addUserToInvitationList(),
matchSetupContainer);
TTLabel playerToSendInvite_flavourText = new TTLabel(
new Point(305,40),
new Dimension(350,50),
"Click on user for remove it",
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
null,
matchSetupContainer);
TTScrollList playerToSendInvite = new TTScrollList(
new Point(305, 80),
new Dimension(232, 135),
new DefaultListModel(),
matchSetupContainer); matchSetupContainer);
addFooter(root); addFooter(root);
@ -104,7 +80,20 @@ public class MatchSetup extends Page{
new Callable<Object>() { new Callable<Object>() {
@Override @Override
public Object call() throws Exception { public Object call() throws Exception {
//If server response ok, start play, else error
Response res = matchSetupController.play(searchUserBar.list);
if (res.code == 200){
//OK, go to next page and show popup
return new Game(Page.window); return new Game(Page.window);
} else {
return new TTDialog("alert", res.message,
new Callable() {
@Override
public Object call() throws Exception {
return new MatchSetup(Page.window);
}
},null);
}
} }
}); });

27
Client/src/com/texttwist/client/pages/MatchSetupController.java Normal file
View file

@ -0,0 +1,27 @@
package com.texttwist.client.pages;
import com.texttwist.client.App;
import models.Response;
import javax.swing.*;
import java.net.MalformedURLException;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
/**
* Created by loke on 18/06/2017.
*/
public class MatchSetupController {
public MatchSetupController(){}
public Response play(DefaultListModel<String> userNames) throws RemoteException, NotBoundException, MalformedURLException {
System.out.print(userNames.toString());
/* Response res = App.authService.login(userName,password);
if (res.code == 200){
App.sessionService.create(userName, res.data.get("token").toString());
}*/
return null;
}
}

2
Client/src/com/texttwist/client/pages/Page.java
View file

@ -34,7 +34,7 @@ public class Page {
window.add(root); window.add(root);
} }
public void createUIComponents() throws IOException {} public void createUIComponents() throws Exception {}
public void addLogo(TTContainer parent) { public void addLogo(TTContainer parent) {
TTContainer container = new TTContainer( TTContainer container = new TTContainer(

87
Client/src/com/texttwist/client/ui/TTSearchBar.java
View file

@ -1,5 +1,7 @@
package com.texttwist.client.ui; package com.texttwist.client.ui;
import com.texttwist.client.constants.Palette; import com.texttwist.client.constants.Palette;
import com.texttwist.client.pages.MatchSetup;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
@ -12,34 +14,103 @@ import java.util.concurrent.Callable;
/** /**
* Created by loke on 14/06/2017. * Created by loke on 14/06/2017.
*/ */
public class TTSearchBar extends TTInputField{ public class TTSearchBar extends TTContainer{
private DefaultListModel matchedUsers = new DefaultListModel(); private DefaultListModel matchedUsers = new DefaultListModel();
public DefaultListModel<String> list = new DefaultListModel<String>();
private Callable<Object> add(TTInputField ctx){
return new Callable<Object>() {
@Override
public Object call() throws Exception {
String username = ctx.getText();
ctx.setText("");
list.addElement(username);
return null;
}
};
}
public TTSearchBar(Point position, public TTSearchBar(Point position,
Dimension dimension, Dimension dimension,
String placeholer, String placeholer,
DefaultListModel listModel, TTContainer parent) throws Exception {
Callable<Object> clickHandler,
TTContainer parent){
super(position, dimension, placeholer, parent); super(position, dimension, Palette.inputBox_backgroundColor, -1, parent);
setBackground(Palette.scrollPanel_backgroundColor); setBackground(Palette.scrollPanel_backgroundColor);
setFont(Palette.inputBox_font); setFont(Palette.inputBox_font);
setBounds(position.x, position.y, dimension.width, dimension.height); setBounds(position.x, position.y, dimension.width, dimension.height);
setPreferredSize(dimension); setPreferredSize(dimension);
setForeground(Palette.fontColor); setForeground(Palette.fontColor);
TTScrollList userList = new TTScrollList( TTLabel playerFinder_flavourText = new TTLabel(
new Point(20,40),
new Dimension(350,50),
"<html>Player to invite</html>",
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
null,
parent);
TTInputField usernameField = new TTInputField(
new Point(20,80),
new Dimension(250,45),
"Username",
parent);
/* TTScrollList userList = new TTScrollList(
new Point(20,120), new Point(20,120),
new Dimension(250,95), new Dimension(250,95),
matchedUsers, matchedUsers,
parent parent
); );*/
addKeyListener(new KeyAdapter() { TTButton addUser = new TTButton(
new Point(70,140),
new Dimension(150,50),
"Add!",
add(usernameField),
parent);
TTLabel playerToSendInvite_flavourText = new TTLabel(
new Point(305,40),
new Dimension(350,50),
"Double-Click on user for remove",
new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
null,
parent);
TTScrollList playerToSendInvite = new TTScrollList(
new Point(305, 80),
new Dimension(232, 135),
list,
parent);
playerToSendInvite.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent evt) {
super.mouseClicked(evt);
JList thisList = (JList)evt.getSource();
if (evt.getClickCount() == 2) {
// Double-click detected
int index = thisList.locationToIndex(evt.getPoint());
list.remove(index);
}
}
});
usernameField.addKeyListener(new KeyAdapter() {
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
super.keyPressed(e); super.keyPressed(e);
if(e.getKeyCode() == 10){
try {
add(usernameField).call();
} catch (Exception e1) {
e1.printStackTrace();
}
}
//Every time i press a key, execute a search of users //Every time i press a key, execute a search of users
} }
}); });

60
server.log
View file

@ -768,3 +768,63 @@ LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Server starting ...
LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Auth Service running at 9999 port... LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Server started LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Server started
LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Game Service is running at 10000 port... LOGGER (Server): Sun Jun 18 14:12:33 CEST 2017 - Game Service is running at 10000 port...
LOGGER (Server): Sun Jun 18 20:14:59 CEST 2017 - Server starting ...
LOGGER (Server): Sun Jun 18 20:14:59 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Sun Jun 18 20:14:59 CEST 2017 - Server started
LOGGER (Server): Sun Jun 18 20:14:59 CEST 2017 - Game Service is running at 10000 port...
LOGGER (Server): Sun Jun 18 20:16:35 CEST 2017 - Server starting ...
LOGGER (Server): Sun Jun 18 20:16:35 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Sun Jun 18 20:16:35 CEST 2017 - Server started
LOGGER (Server): Sun Jun 18 20:16:35 CEST 2017 - Game Service is running at 10000 port...
LOGGER (Server): Sun Jun 18 20:16:46 CEST 2017 - Invoked register with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:16:46 CEST 2017 - Registration successfull
LOGGER (Server): Sun Jun 18 20:16:48 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:16:48 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:21:13 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:21:13 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:24:50 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:24:50 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:25:42 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:25:43 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:30:07 CEST 2017 - Server starting ...
LOGGER (Server): Sun Jun 18 20:30:07 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Sun Jun 18 20:30:07 CEST 2017 - Server started
LOGGER (Server): Sun Jun 18 20:30:07 CEST 2017 - Game Service is running at 10000 port...
LOGGER (Server): Sun Jun 18 20:30:10 CEST 2017 - Invoked register with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:30:10 CEST 2017 - Registration successfull
LOGGER (Server): Sun Jun 18 20:30:13 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:30:13 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:33:00 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:33:00 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:35:20 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:35:20 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:48:47 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:48:47 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:50:42 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:50:42 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:52:12 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:52:12 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:52:51 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:52:51 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:53:05 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:53:05 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:54:02 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:54:02 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:54:57 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:54:57 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:56:00 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:56:00 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 20:59:49 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 20:59:49 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 21:00:12 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 21:00:12 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 21:03:01 CEST 2017 - Server starting ...
LOGGER (Server): Sun Jun 18 21:03:01 CEST 2017 - Auth Service running at 9999 port...
LOGGER (Server): Sun Jun 18 21:03:01 CEST 2017 - Server started
LOGGER (Server): Sun Jun 18 21:03:01 CEST 2017 - Game Service is running at 10000 port...
LOGGER (Server): Sun Jun 18 21:03:07 CEST 2017 - Invoked register with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 21:03:07 CEST 2017 - Registration successfull
LOGGER (Server): Sun Jun 18 21:03:09 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 21:03:09 CEST 2017 - Login successfull
LOGGER (Server): Sun Jun 18 21:13:00 CEST 2017 - Invoked login with username=asd AND password=asd
LOGGER (Server): Sun Jun 18 21:13:00 CEST 2017 - Login successfull