diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 861ae1eb9b02775f608eab3fe2853e8851be35c5..efa7fbbcdd19292eaaa403f69f83a57138bcfad8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,33 +1,35 @@
<?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="">
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <list default="true" id="7d248efa-573c-4847-b942-df9b4c49b118" 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" />
<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" />
<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" />
+ <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/Tools.class" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module" 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/IClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.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$/src/GUI/ApplicationMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/ApplicationMain.java" 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$/out/production/infinitymonkeys/server/Server.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" 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/server/DrawingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/DrawingController.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -35,50 +37,33 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="DefaultGradleProjectSettings">
- <option name="testRunner" value="GRADLE" />
- <option name="delegatedBuild" value="true" />
- </component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>RMI</find>
- <find>Black</find>
- <find>colorOptions</find>
- <find>Send</find>
- <find>message</find>
- <find>userSelectComboBox</find>
- <find>updateUserList</find>
- <find>send</find>
- <find>broadcastMessage</find>
- <find>sent</find>
- </findStrings>
- </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="master" />
- </map>
+ </component>
+ <component name="IgnoredFileRootStore">
+ <option name="generatedRoots">
+ <set>
+ <option value="$PROJECT_DIR$/.idea" />
+ </set>
</option>
</component>
<component name="ProjectConfigurationFiles">
<option name="files">
<list>
- <option value="$PROJECT_DIR$/.idea/uiDesigner.xml" />
+ <option value="$PROJECT_DIR$/.idea/.gitignore" />
+ <option value="$PROJECT_DIR$/.idea/comp90015-dsass2-infinitymonkeys-remaster.iml" />
+ <option value="$PROJECT_DIR$/.idea/modules.xml" />
</list>
</option>
</component>
- <component name="ProjectId" id="1SVgnDiSFxSanFbLYY5D9RJaXPS" />
+ <component name="ProjectId" id="1SawkRB22mTFnhM0v5PRJ8xJhId" />
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="387" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../Git Projects" />
- <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
- <property name="nodejs_npm_path_reset_for_default_project" value="true" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.15" />
+ <property name="project.structure.last.edited" value="Global Libraries" />
+ <property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RunDashboard">
@@ -93,19 +78,17 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Application.Client1">
- <configuration name="Client 3" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" value="client.Client" />
- <module name="infinitymonkeys" />
- <option name="PROGRAM_PARAMETERS" value="Eldar -Djava.rmi.server.codebase=file:"G:\My Drive\UniMelb\2nd Semester\Distributed Systems\Assignment 2\Code\comp90015-dsass2-infinitymonkeys-remaster\out\production\comp90015-dsass2-infinitymonkeys-remaster"" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="Client1" type="Application" factoryName="Application">
+ <component name="RunManager" selected="Application.Client2">
+ <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="client.Client" />
<module name="infinitymonkeys" />
- <option name="PROGRAM_PARAMETERS" value="Max -Djava.rmi.server.codebase=file:"G:\My Drive\UniMelb\2nd Semester\Distributed Systems\Assignment 2\Code\comp90015-dsass2-infinitymonkeys-remaster\out\production\comp90015-dsass2-infinitymonkeys-remaster"" />
+ <option name="PROGRAM_PARAMETERS" value="Eldar" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="client.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -113,63 +96,56 @@
<configuration name="Client2" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="client.Client" />
<module name="infinitymonkeys" />
- <option name="PROGRAM_PARAMETERS" value="Hai -Djava.rmi.server.codebase=file:"G:\My Drive\UniMelb\2nd Semester\Distributed Systems\Assignment 2\Code\comp90015-dsass2-infinitymonkeys-remaster\out\production\comp90015-dsass2-infinitymonkeys-remaster"" />
+ <option name="PROGRAM_PARAMETERS" value="EvilEldar" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="Server" type="Application" factoryName="Application">
+ <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="server.Server" />
<module name="infinitymonkeys" />
- <option name="PROGRAM_PARAMETERS" value="-Djava.rmi.server.codebase=file:"G:\My Drive\UniMelb\2nd Semester\Distributed Systems\Assignment 2\Code\comp90015-dsass2-infinitymonkeys-remaster\out\production\comp90015-dsass2-infinitymonkeys-remaster"" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="server.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
- <item itemvalue="Application.Server" />
- <item itemvalue="Application.Client1" />
<item itemvalue="Application.Client2" />
- <item itemvalue="Application.Client 3" />
+ <item itemvalue="Application.Client" />
+ <item itemvalue="Application.Server" />
</list>
+ <recent_temporary>
+ <list>
+ <item itemvalue="Application.Client" />
+ <item itemvalue="Application.Server" />
+ </list>
+ </recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="" />
- <created>1571631720382</created>
+ <changelist id="7d248efa-573c-4847-b942-df9b4c49b118" name="Default Changelist" comment="" />
+ <created>1571815156204</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
- <updated>1571631720382</updated>
- <workItem from="1571631723795" duration="17601000" />
- <workItem from="1571654347656" duration="25114000" />
- <workItem from="1571786278739" duration="3319000" />
- </task>
- <task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface">
- <created>1571646862883</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1571646862883</updated>
+ <updated>1571815156204</updated>
+ <workItem from="1571815157364" duration="1039000" />
+ <workItem from="1571816646909" duration="820000" />
+ <workItem from="1571818565591" duration="60000" />
+ <workItem from="1571818658517" duration="1442000" />
</task>
- <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
- <component name="Vcs.Log.History.Properties">
- <option name="COLUMN_ORDER">
- <list>
- <option value="0" />
- <option value="2" />
- <option value="3" />
- <option value="1" />
- </list>
- </option>
- </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
@@ -183,10 +159,6 @@
</map>
</option>
</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" />
- </component>
<component name="simpleUML.UMLToolWindowPlugin">
<General>
<option name="birdViewUpdateDelay" value="2000" />
diff --git a/out/production/infinitymonkeys/GUI/ApplicationMain$1.class b/out/production/infinitymonkeys/GUI/ApplicationMain$1.class
index 11cceb78224800b744c0dab89125b3f7a56eb3dc..53ab993ffb5396ea40f561532ef42130c2217086 100644
Binary files a/out/production/infinitymonkeys/GUI/ApplicationMain$1.class and b/out/production/infinitymonkeys/GUI/ApplicationMain$1.class differ
diff --git a/out/production/infinitymonkeys/GUI/ApplicationMain.class b/out/production/infinitymonkeys/GUI/ApplicationMain.class
index b08b1f8e1a585cb7a899a88fce6172d18c6e1283..b4b75756b0ed768b77c04e286ec9be4f904488d2 100644
Binary files a/out/production/infinitymonkeys/GUI/ApplicationMain.class and b/out/production/infinitymonkeys/GUI/ApplicationMain.class differ
diff --git a/out/production/infinitymonkeys/GUI/ChatScreen.class b/out/production/infinitymonkeys/GUI/ChatScreen.class
index 675758f83227a469c5fc3b3b3d0f714c286b9eab..06a5c243a1629f3f56901427e2d48d9d35a013a3 100644
Binary files a/out/production/infinitymonkeys/GUI/ChatScreen.class and b/out/production/infinitymonkeys/GUI/ChatScreen.class differ
diff --git a/out/production/infinitymonkeys/GUI/ColorPallete.class b/out/production/infinitymonkeys/GUI/ColorPallete.class
deleted file mode 100644
index 0795201c54134b35416d2e9bc194cb3e30720c7b..0000000000000000000000000000000000000000
Binary files a/out/production/infinitymonkeys/GUI/ColorPallete.class and /dev/null differ
diff --git a/out/production/infinitymonkeys/GUI/DrawingArea$1.class b/out/production/infinitymonkeys/GUI/DrawingArea$1.class
index 8d0767f47053ee7e77165cda1ad6b206255bccea..b0b6ced309df67c585262b5d7319efb40f28c19e 100644
Binary files a/out/production/infinitymonkeys/GUI/DrawingArea$1.class and b/out/production/infinitymonkeys/GUI/DrawingArea$1.class differ
diff --git a/out/production/infinitymonkeys/GUI/DrawingArea.class b/out/production/infinitymonkeys/GUI/DrawingArea.class
index dea5162edd17755dbf52607a9512faa02522e26a..8f66a7753ac8696ff07d04167778e21eef2c029b 100644
Binary files a/out/production/infinitymonkeys/GUI/DrawingArea.class and b/out/production/infinitymonkeys/GUI/DrawingArea.class differ
diff --git a/out/production/infinitymonkeys/GUI/MenuBar.class b/out/production/infinitymonkeys/GUI/MenuBar.class
deleted file mode 100644
index a24c9fc484961be8f3ca5d24268b42ed44163d5e..0000000000000000000000000000000000000000
Binary files a/out/production/infinitymonkeys/GUI/MenuBar.class and /dev/null differ
diff --git a/out/production/infinitymonkeys/GUI/PaintGUI$1.class b/out/production/infinitymonkeys/GUI/PaintGUI$1.class
index 96e215a04f61c099d09838995f7e359e972fec38..f5d4af48346e9a9fec9cf800407482e03e85513f 100644
Binary files a/out/production/infinitymonkeys/GUI/PaintGUI$1.class and b/out/production/infinitymonkeys/GUI/PaintGUI$1.class differ
diff --git a/out/production/infinitymonkeys/GUI/PaintGUI.class b/out/production/infinitymonkeys/GUI/PaintGUI.class
index 88ded32f579c6224edff986c1983774aca5d876f..f6a84a03a8db02755123f33ad98d85cf2eaa4e2f 100644
Binary files a/out/production/infinitymonkeys/GUI/PaintGUI.class and b/out/production/infinitymonkeys/GUI/PaintGUI.class differ
diff --git a/out/production/infinitymonkeys/GUI/StartScreen$1.class b/out/production/infinitymonkeys/GUI/StartScreen$1.class
index fe73d4e2d50930d8a12d46e1e6e140474f708ea2..fe1bdfe2ee23af168c4895971736d4752ea4eeef 100644
Binary files a/out/production/infinitymonkeys/GUI/StartScreen$1.class and b/out/production/infinitymonkeys/GUI/StartScreen$1.class differ
diff --git a/out/production/infinitymonkeys/GUI/StartScreen.class b/out/production/infinitymonkeys/GUI/StartScreen.class
index 1188a7bfa851afce8d49cfb13966159d00c86633..e302c80611c6c4e33c9c8274b874942a80ef7d35 100644
Binary files a/out/production/infinitymonkeys/GUI/StartScreen.class and b/out/production/infinitymonkeys/GUI/StartScreen.class differ
diff --git a/out/production/infinitymonkeys/GUI/ToolBar.class b/out/production/infinitymonkeys/GUI/ToolBar.class
deleted file mode 100644
index a261bb8a4822e43418c1708eeb8e113b94739e4a..0000000000000000000000000000000000000000
Binary files a/out/production/infinitymonkeys/GUI/ToolBar.class and /dev/null differ
diff --git a/out/production/infinitymonkeys/GUI/Tools.class b/out/production/infinitymonkeys/GUI/Tools.class
deleted file mode 100644
index b27fffe3334a1604da267722f9a0490a7cd01d2a..0000000000000000000000000000000000000000
Binary files a/out/production/infinitymonkeys/GUI/Tools.class and /dev/null differ
diff --git a/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module b/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module
index 8fb60192d378759239a3ecbf60eac8c8de446e9c..2983af70661ad375cc499ebc4da5a68ca46c532e 100644
Binary files a/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module and b/out/production/infinitymonkeys/META-INF/infinitymonkeys.kotlin_module differ
diff --git a/out/production/infinitymonkeys/client/Client.class b/out/production/infinitymonkeys/client/Client.class
index f4d0697ec65644133ca160285ecf365130475589..bf033c3cb50b8da487fb65398b83ca061464bd9e 100644
Binary files a/out/production/infinitymonkeys/client/Client.class and b/out/production/infinitymonkeys/client/Client.class differ
diff --git a/out/production/infinitymonkeys/client/ClientUpdate$1.class b/out/production/infinitymonkeys/client/ClientUpdate$1.class
index a6557db01c39906b9407183cbe45f7985e6f27e8..772f03c5a8b33a7af5902cb5496499fd868feb95 100644
Binary files a/out/production/infinitymonkeys/client/ClientUpdate$1.class and b/out/production/infinitymonkeys/client/ClientUpdate$1.class differ
diff --git a/out/production/infinitymonkeys/client/ClientUpdate.class b/out/production/infinitymonkeys/client/ClientUpdate.class
index 8e2cefd33df97034b4f7915642756b775c22898c..bf63d67a026e2307b12afc151d5108d7cbe30a64 100644
Binary files a/out/production/infinitymonkeys/client/ClientUpdate.class and b/out/production/infinitymonkeys/client/ClientUpdate.class differ
diff --git a/out/production/infinitymonkeys/client/DrawingUpdate.class b/out/production/infinitymonkeys/client/DrawingUpdate.class
index df881705ca5c05e240dfd409ec2c021575fafe37..8e57b9dfaa70a5599502a2b8f80a0df8c68771ea 100644
Binary files a/out/production/infinitymonkeys/client/DrawingUpdate.class and b/out/production/infinitymonkeys/client/DrawingUpdate.class differ
diff --git a/out/production/infinitymonkeys/remote/IClientController.class b/out/production/infinitymonkeys/remote/IClientController.class
index d438a291276cb8f60071c2bb1916a305991156c4..66a2945a391c614034311d55d20b59612d99dfdf 100644
Binary files a/out/production/infinitymonkeys/remote/IClientController.class and b/out/production/infinitymonkeys/remote/IClientController.class differ
diff --git a/out/production/infinitymonkeys/remote/IDrawingController.class b/out/production/infinitymonkeys/remote/IDrawingController.class
index 4ee26d4196eeb7419ffb011e43e6374bd5eec4c0..428c6a7f30a57b1c8f31314a1e3e3320ff5c2ee3 100644
Binary files a/out/production/infinitymonkeys/remote/IDrawingController.class and b/out/production/infinitymonkeys/remote/IDrawingController.class differ
diff --git a/out/production/infinitymonkeys/remote/IDrawingUpdate.class b/out/production/infinitymonkeys/remote/IDrawingUpdate.class
index f41f9a05a74d875caa31672fc6b33ccbc09bbf1a..c87eedd773afa0eb339b4384e3912c5d1b60c3bd 100644
Binary files a/out/production/infinitymonkeys/remote/IDrawingUpdate.class and b/out/production/infinitymonkeys/remote/IDrawingUpdate.class differ
diff --git a/out/production/infinitymonkeys/server/ClientController$1.class b/out/production/infinitymonkeys/server/ClientController$1.class
index bad43cb0d3d2f3d5df39f5772609ead65f352bde..c8e6540c375c8913bf66fe80fcd2be22f7a11857 100644
Binary files a/out/production/infinitymonkeys/server/ClientController$1.class and b/out/production/infinitymonkeys/server/ClientController$1.class differ
diff --git a/out/production/infinitymonkeys/server/ClientController.class b/out/production/infinitymonkeys/server/ClientController.class
index 9b3a65bdc428d61632fca4ce5ff30a4697ff1170..00868b2be4b6151028813f3666fd941cc790deda 100644
Binary files a/out/production/infinitymonkeys/server/ClientController.class and b/out/production/infinitymonkeys/server/ClientController.class differ
diff --git a/out/production/infinitymonkeys/server/DrawingController.class b/out/production/infinitymonkeys/server/DrawingController.class
index 00fe8a78bb29e4f2193e8164d2e79f8e19c0b051..76fe57c3e3a88cdc108af4a06a4266a714cd96fb 100644
Binary files a/out/production/infinitymonkeys/server/DrawingController.class and b/out/production/infinitymonkeys/server/DrawingController.class differ
diff --git a/out/production/infinitymonkeys/server/Server.class b/out/production/infinitymonkeys/server/Server.class
index 0c1967b8f8157aa219773025b224455fa21cf3ef..3e54605fe1c8f601825950f467aec87efd4c33cb 100644
Binary files a/out/production/infinitymonkeys/server/Server.class and b/out/production/infinitymonkeys/server/Server.class differ
diff --git a/src/client/Client.java b/src/client/Client.java
index 800fac6e8eb9444b5018277491d4e3dc6cec8b47..f5e735fd847a4910f00fea4e19b9f36a7b0653ef 100644
--- a/src/client/Client.java
+++ b/src/client/Client.java
@@ -93,7 +93,9 @@ public class Client
catch (Exception e)
{
StartScreen.showErrorMessage("Error starting up client");
+ e.printStackTrace();
System.exit(0);
+
}
}
diff --git a/src/server/DrawingController.java b/src/server/DrawingController.java
index d52aebe4592c31b9e5c84be2d689a33490ac17fb..15baa53dedd5ef6836f1936bf6786c04fb379df1 100644
--- a/src/server/DrawingController.java
+++ b/src/server/DrawingController.java
@@ -50,7 +50,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
this.strokeSizeList = new ArrayList<Integer>();
this.textList = new ArrayList<String>();
- this.fontList = new ArrayList<Font>();
+ this.fontList = new ArrayList<Font>();
this.textStartPointList = new ArrayList<Point>();
}