diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index baa60e5d9dbfb8cc38249f892740141829c6ed42..9aed85fe2445a2e25f3417918ea387eeedf5be2f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,50 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="Changed the join method to send over a reference of the ClientUpdate Interface">
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ColorPallete.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ColorPallete.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea$Mode.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea$Mode.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/MenuBar.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/MenuBar.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ToolBar.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ToolBar.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/Tools.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/Tools.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ChatUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ChatUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/Client.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/Client.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/DrawingUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/DrawingUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IChatController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IChatController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IChatUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IChatUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController$Action.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController$Action.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate$Action.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate$Action.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IDrawingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IDrawingController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IDrawingUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IDrawingUpdate.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ChatController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ChatController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController$1.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/DrawingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/DrawingController.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/User.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/User.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/GUI/ChatScreen.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/ChatScreen.form" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.form" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/client/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/client/Client.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/client/ClientUpdate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/client/ClientUpdate.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/remote/IClientController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/remote/IClientController.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/server/ClientController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/ClientController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/server/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/Server.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -94,11 +52,11 @@
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/GUI/StartScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="87" column="5" lean-forward="true" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
+ <state relative-caret-position="195">
+ <caret line="89" lean-forward="true" selection-start-line="89" selection-end-line="89" />
<folding>
<element signature="e#414#415#0" expanded="true" />
<element signature="e#450#451#0" expanded="true" />
@@ -116,6 +74,19 @@
</provider>
</entry>
</file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/server/Server.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="260">
+ <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+ <folding>
+ <element signature="e#825#826#0" expanded="true" />
+ <element signature="e#865#866#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/client/ChatUpdate.java">
<provider selected="true" editor-type-id="text-editor">
@@ -168,8 +139,8 @@
<find>showErrorMessage</find>
<find>Currently</find>
<find>windowClosing</find>
- <find>printUserList</find>
<find>Error</find>
+ <find>printUserList</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -184,7 +155,6 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/.idea/misc.xml" />
- <option value="$PROJECT_DIR$/src/server/Server.java" />
<option value="$PROJECT_DIR$/src/client/ClientUpdate.java" />
<option value="$PROJECT_DIR$/src/GUI/PasswordScreen.java" />
<option value="$PROJECT_DIR$/src/server/ClientController.java" />
@@ -193,6 +163,7 @@
<option value="$PROJECT_DIR$/src/GUI/StartScreen.java" />
<option value="$PROJECT_DIR$/src/GUI/ChatScreen.form" />
<option value="$PROJECT_DIR$/src/GUI/StartScreen.form" />
+ <option value="$PROJECT_DIR$/src/server/Server.java" />
</list>
</option>
</component>
@@ -215,6 +186,23 @@
<item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
<item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
</path>
+ <path>
+ <item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
+ <item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
+ <item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="remote" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
+ <item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="server" type="462c0819:PsiDirectoryNode" />
+ </path>
</expand>
<select />
</subPane>
@@ -299,7 +287,7 @@
<workItem from="1571631723795" duration="17601000" />
<workItem from="1571654347656" duration="25114000" />
<workItem from="1571744361727" duration="9985000" />
- <workItem from="1571801308877" duration="9073000" />
+ <workItem from="1571801308877" duration="9369000" />
</task>
<task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface">
<created>1571646862883</created>
@@ -308,17 +296,24 @@
<option name="project" value="LOCAL" />
<updated>1571646862883</updated>
</task>
- <option name="localTasksCounter" value="2" />
+ <task id="LOCAL-00002" summary="Added the password to StartScreen.">
+ <created>1571812270188</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1571812270188</updated>
+ </task>
+ <option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="19058000" />
+ <option name="totallyTimeSpent" value="19354000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1295" height="704" extended-state="6" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2534413" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2534413" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -328,7 +323,7 @@
<window_info id="JavaEE:App" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32867134" />
- <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.34265736" />
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.34265736" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -397,7 +392,8 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Changed the join method to send over a reference of the ClientUpdate Interface" />
- <option name="LAST_COMMIT_MESSAGE" value="Changed the join method to send over a reference of the ClientUpdate Interface" />
+ <MESSAGE value="Added the password to StartScreen." />
+ <option name="LAST_COMMIT_MESSAGE" value="Added the password to StartScreen." />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
@@ -414,19 +410,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/Server.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="35" column="34" lean-forward="true" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" />
- <folding>
- <element signature="e#825#826#0" expanded="true" />
- <element signature="e#864#865#0" expanded="true" />
- <element signature="e#911#912#0" expanded="true" />
- <element signature="e#941#942#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/server/ChatController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1139">
@@ -462,13 +445,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="206">
- <caret line="215" column="9" lean-forward="true" selection-start-line="215" selection-start-column="9" selection-end-line="215" selection-end-column="9" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/remote/IClientController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="56">
@@ -509,8 +485,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/GUI/StartScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="161">
- <caret line="87" column="5" lean-forward="true" selection-start-line="87" selection-start-column="5" selection-end-line="87" selection-end-column="5" />
+ <state relative-caret-position="195">
+ <caret line="89" lean-forward="true" selection-start-line="89" selection-end-line="89" />
<folding>
<element signature="e#414#415#0" expanded="true" />
<element signature="e#450#451#0" expanded="true" />
@@ -518,6 +494,24 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="206">
+ <caret line="215" column="9" lean-forward="true" selection-start-line="215" selection-start-column="9" selection-end-line="215" selection-end-column="9" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/server/Server.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="260">
+ <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+ <folding>
+ <element signature="e#825#826#0" expanded="true" />
+ <element signature="e#865#866#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/src/server/Server.java b/src/server/Server.java
index 2d87de90d579fa6ed92b7fdb29b0cc8c11311b8d..0160269bb14d69676c82e568f5521ab9d84ae94d 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -62,9 +62,9 @@ public class Server
String chatControllerName = "ChatController";
String drawingControllerName = "DrawingController";
- IClientController clientController = new ClientController(this);
- IChatController chatController = new ChatController(this);
- IDrawingController drawingController = new DrawingController(this);
+ IClientController clientController = this.clientController;
+ IChatController chatController = this.chatController;
+ IDrawingController drawingController = this.drawingController;
registry.rebind(clientControllerName, clientController);
registry.rebind(chatControllerName, chatController);