From 3f62a7c08f49b58a1f98a0d9bc966f69f1f22079 Mon Sep 17 00:00:00 2001
From: mpriymak <mpriymak@gmail.com>
Date: Thu, 24 Oct 2019 14:27:46 +1100
Subject: [PATCH] commit to test network connectivity
---
.idea/workspace.xml | 557 +++++++++++++-----
.../infinitymonkeys/client/Client.class | Bin 5017 -> 5052 bytes
.../infinitymonkeys/server/Server.class | Bin 3272 -> 3272 bytes
src/client/ChatUpdate.java | 1 -
src/client/Client.java | 13 +-
src/server/Server.java | 15 +
src/server/security.policy | 4 +
7 files changed, 436 insertions(+), 154 deletions(-)
create mode 100644 src/server/security.policy
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5a0ec9d..f642dcb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,18 +1,13 @@
<?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="">
+ <list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="implemented an IP/Host resolution on server">
+ <change afterPath="$PROJECT_DIR$/src/server/security.policy" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/remote/IClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.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/MySharedKey.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/MySharedKey.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$/src/client/ChatUpdate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/client/ChatUpdate.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/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/MySharedKey.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/MySharedKey.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" />
@@ -26,28 +21,129 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/client/Client.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-187">
- <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
+ <state relative-caret-position="68">
+ <caret line="137" column="11" lean-forward="true" selection-start-line="137" selection-start-column="11" selection-end-line="137" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/client/ChatUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="153">
+ <caret line="12" column="59" lean-forward="true" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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>
+ <caret lean-forward="true" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/server/ChatController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="68">
+ <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/GUI/ApplicationMain.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="646">
+ <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="226">
- <caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
+ <state relative-caret-position="459">
+ <caret line="63" column="57" lean-forward="true" selection-start-line="63" selection-start-column="57" selection-end-line="63" selection-end-column="57" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-819">
+ <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/GUI/PaintGUI.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="164">
+ <caret line="49" column="48" selection-start-line="49" selection-start-column="48" selection-end-line="49" selection-end-column="48" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/GUI/DrawingArea.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="357">
+ <caret line="47" column="26" lean-forward="true" selection-start-line="47" selection-start-column="26" selection-end-line="47" selection-end-column="26" />
<folding>
- <element signature="e#825#826#0" expanded="true" />
- <element signature="e#865#866#0" expanded="true" />
+ <element signature="e#2140#2141#0" expanded="true" />
+ <element signature="e#2170#2171#0" expanded="true" />
+ <element signature="e#2215#2216#0" expanded="true" />
+ <element signature="e#2253#2254#0" expanded="true" />
+ <element signature="e#4829#4830#0" expanded="true" />
+ <element signature="e#4872#4873#0" expanded="true" />
+ <element signature="e#4905#4906#0" expanded="true" />
+ <element signature="e#4944#4945#0" expanded="true" />
+ <element signature="e#4979#4980#0" expanded="true" />
+ <element signature="e#5020#5021#0" expanded="true" />
+ <element signature="e#5058#5059#0" expanded="true" />
+ <element signature="e#5102#5103#0" expanded="true" />
+ <element signature="e#5135#5136#0" expanded="true" />
+ <element signature="e#5174#5175#0" expanded="true" />
+ <element signature="e#5208#5209#0" expanded="true" />
+ <element signature="e#5248#5249#0" expanded="true" />
+ <element signature="e#5469#5470#0" expanded="true" />
+ <element signature="e#5503#5504#0" expanded="true" />
+ <element signature="e#5573#5574#0" expanded="true" />
+ <element signature="e#5623#5624#0" expanded="true" />
+ <element signature="e#5666#5667#0" expanded="true" />
+ <element signature="e#5699#5700#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/GUI/MenuBar.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="119">
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -76,6 +172,8 @@
<find>windowClosing</find>
<find>Error</find>
<find>printUserList</find>
+ <find>serverAddress</find>
+ <find>Tool</find>
</findStrings>
</component>
<component name="Git.Settings">
@@ -100,10 +198,13 @@
<option value="$PROJECT_DIR$/src/remote/IEncryptionUpdate.java" />
<option value="$PROJECT_DIR$/src/client/EncryptionUpdate.java" />
<option value="$PROJECT_DIR$/src/server/MySharedKey.java" />
- <option value="$PROJECT_DIR$/src/client/Client.java" />
<option value="$PROJECT_DIR$/src/server/ClientController.java" />
<option value="$PROJECT_DIR$/src/remote/IClientController.java" />
+ <option value="$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/server/BoardServerImpl.java" />
+ <option value="$PROJECT_DIR$/src/server/security.policy" />
+ <option value="$PROJECT_DIR$/src/client/ChatUpdate.java" />
<option value="$PROJECT_DIR$/src/server/Server.java" />
+ <option value="$PROJECT_DIR$/src/client/Client.java" />
</list>
</option>
</component>
@@ -143,6 +244,13 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="GUI" 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="GUI" type="462c0819:PsiDirectoryNode" />
+ <item name="ToolBar.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
+ </path>
<path>
<item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
<item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
@@ -169,6 +277,13 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="server" 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" />
+ <item name="DrawingController.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
+ </path>
</expand>
<select />
</subPane>
@@ -184,6 +299,7 @@
<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="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
@@ -200,7 +316,7 @@
</list>
</option>
</component>
- <component name="RunManager" selected="Application.Server">
+ <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" />
@@ -212,7 +328,7 @@
<configuration name="Client1" type="Application" factoryName="Application">
<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="-Djava.rmi.server.codebase=file:"C:\infinitymonkeys\out\production\infinitymonkeys\"" />
<method v="2">
<option name="Make" enabled="true" />
</method>
@@ -228,13 +344,21 @@
<configuration name="Server" type="Application" factoryName="Application">
<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"" />
+ <option name="PROGRAM_PARAMETERS" value="-Djava.rmi.server.codebase=file:"C:\infinitymonkeys\out\production\infinitymonkeys"" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="TestServer" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" value="server.Server" />
+ <module name="infinitymonkeys" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list>
<item itemvalue="Application.Server" />
+ <item itemvalue="Application.TestServer" />
<item itemvalue="Application.Client1" />
<item itemvalue="Application.Client2" />
<item itemvalue="Application.Client 3" />
@@ -253,7 +377,7 @@
<workItem from="1571631723795" duration="17601000" />
<workItem from="1571654347656" duration="25114000" />
<workItem from="1571744361727" duration="9985000" />
- <workItem from="1571801308877" duration="16834000" />
+ <workItem from="1571801308877" duration="36421000" />
</task>
<task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface">
<created>1571646862883</created>
@@ -283,11 +407,27 @@
<option name="project" value="LOCAL" />
<updated>1571818420031</updated>
</task>
- <option name="localTasksCounter" value="5" />
+ <task id="LOCAL-00005" summary="implemented an IP/Host resolution on server">
+ <created>1571820441967</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1571820441967</updated>
+ </task>
+ <option name="localTasksCounter" value="6" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="26819000" />
+ <option name="totallyTimeSpent" value="46406000" />
+ </component>
+ <component name="TodoView">
+ <todo-panel id="selected-file">
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
+ <todo-panel id="all">
+ <are-packages-shown value="true" />
+ <is-autoscroll-to-source value="true" />
+ </todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1295" height="704" extended-state="6" />
@@ -307,8 +447,8 @@
<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" />
- <window_info anchor="bottom" id="TODO" order="6" />
- <window_info anchor="bottom" id="Terminal" order="7" />
+ <window_info anchor="bottom" id="TODO" order="6" weight="0.32867134" />
+ <window_info anchor="bottom" id="Terminal" order="7" weight="0.32867134" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="10" weight="0.32867134" />
@@ -375,263 +515,376 @@
<MESSAGE value="Added the password to StartScreen." />
<MESSAGE value="Fixed bug in server" />
<MESSAGE value="Merged with Eldars encryption code" />
- <option name="LAST_COMMIT_MESSAGE" value="Merged with Eldars encryption code" />
+ <MESSAGE value="implemented an IP/Host resolution on server" />
+ <option name="LAST_COMMIT_MESSAGE" value="implemented an IP/Host resolution on server" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/IClientUpdate.java">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/IEncryptionUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="136">
+ <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/MySharedKey.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="68">
+ <caret line="12" column="22" selection-end-line="41" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/MySharedKey.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="34">
+ <caret line="10" column="24" lean-forward="true" selection-end-line="41" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/IEncryptionUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="85">
- <caret line="5" column="10" lean-forward="true" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+ <state relative-caret-position="136">
+ <caret line="10" lean-forward="true" selection-end-line="10" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SwingJPasswordFieldDemo.zip/SwingJPasswordFieldDemo/src/net/codejava/swing/jpasswordfield/SwingJPasswordFieldDemo.java">
+ <entry file="file://$PROJECT_DIR$/src/remote/IEncryptionUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="173">
- <caret line="80" column="45" selection-start-line="80" selection-start-column="45" selection-end-line="80" selection-end-column="45" />
+ <state relative-caret-position="136">
+ <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/PasswordScreen.java">
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/IClientUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
+ <state relative-caret-position="221">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
- <folding>
- <element signature="imports" expanded="true" />
- <element signature="e#1409#1410#0" expanded="true" />
- <element signature="e#1471#1472#0" expanded="true" />
- <element signature="e#1591#1761#0" expanded="true" />
- <element signature="e#1760#1761#0" expanded="true" />
- </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.java">
+ <entry file="file://$PROJECT_DIR$/src/remote/IClientUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="68">
+ <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/EncryptionUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="685">
- <caret line="105" column="46" lean-forward="true" selection-start-line="105" selection-start-column="46" selection-end-line="105" selection-end-column="46" />
+ <state relative-caret-position="5">
+ <caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/StartScreen.java">
+ <entry file="file://$PROJECT_DIR$/src/client/EncryptionUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="178">
- <caret line="79" lean-forward="true" selection-start-line="79" selection-end-line="79" />
- <folding>
- <element signature="e#414#415#0" expanded="true" />
- <element signature="e#450#451#0" expanded="true" />
- </folding>
+ <state relative-caret-position="158">
+ <caret line="54" column="9" lean-forward="true" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.form">
- <provider selected="true" editor-type-id="ui-designer" />
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ClientUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1040" />
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/StartScreen.form">
- <provider selected="true" editor-type-id="ui-designer" />
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ApplicationMain.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1159" />
+ </provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/ApplicationMain.java">
+ <entry file="file://$PROJECT_DIR$/src/server/MySharedKey.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="354">
- <caret line="103" column="8" selection-start-line="103" selection-start-column="8" selection-end-line="103" selection-end-column="42" />
+ <state relative-caret-position="221">
+ <caret line="21" column="44" lean-forward="true" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/DrawingArea.java">
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ClientController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="306">
- <caret line="127" column="38" selection-end-line="464" selection-end-column="1" />
+ <state relative-caret-position="-2610">
+ <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="46" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/IClientUpdate.java">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/Client.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="153">
+ <caret line="148" column="126" lean-forward="true" selection-start-line="148" selection-start-column="16" selection-end-line="148" selection-end-column="126" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/IEncryptionUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/remote/IClientController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="136">
- <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
+ <state relative-caret-position="119">
+ <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution.zip/SharedKeyDistribution/MySharedKey.java">
+ <entry file="file://$PROJECT_DIR$/../stuff/WhiteboardCOMP90015-master/project/src/ChatServer/ServerDriver.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="68">
- <caret line="12" column="22" selection-end-line="41" />
+ <state relative-caret-position="175">
+ <caret line="17" column="49" selection-start-line="17" selection-start-column="49" selection-end-line="17" selection-end-column="49" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/DrawingArea.java">
+ <entry file="file://$PROJECT_DIR$/../stuff/WhiteboardCOMP90015-master/project/src/ChatServer/Server.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-2032" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/server/BoardEvent.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-386" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/server/IBoardServer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-267" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/server/BoardServerImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="532">
+ <caret line="150" column="52" lean-forward="true" selection-start-line="150" selection-start-column="52" selection-end-line="150" selection-end-column="52" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/gui/SharedPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-3876" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/gui/UserPanel.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-969" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WorkingDistBoard-master/DistBoard/src/gui/WhiteBoard.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="144">
+ <caret line="116" column="7" lean-forward="true" selection-start-line="116" selection-start-column="7" selection-end-line="116" selection-end-column="7" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WhiteboardCOMP90015-master/project/src/ChatClient/ChatClient.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-760" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/WhiteboardCOMP90015-master/project/src/ChatClient/ChatClientDriver.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="204">
+ <caret line="17" column="51" lean-forward="true" selection-start-line="17" selection-start-column="51" selection-end-line="17" selection-end-column="51" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/SharedWhiteBoard_TeamATM-master/src/LoginWindow.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="272">
- <caret line="42" column="30" lean-forward="true" selection-start-line="42" selection-start-column="30" selection-end-line="42" selection-end-column="30" />
+ <state relative-caret-position="99">
+ <caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
<folding>
- <element signature="e#2140#2141#0" expanded="true" />
- <element signature="e#2170#2171#0" expanded="true" />
- <element signature="e#2215#2216#0" expanded="true" />
- <element signature="e#2253#2254#0" expanded="true" />
- <element signature="e#4829#4830#0" expanded="true" />
- <element signature="e#4872#4873#0" expanded="true" />
- <element signature="e#4905#4906#0" expanded="true" />
- <element signature="e#4944#4945#0" expanded="true" />
- <element signature="e#4979#4980#0" expanded="true" />
- <element signature="e#5020#5021#0" expanded="true" />
- <element signature="e#5058#5059#0" expanded="true" />
- <element signature="e#5102#5103#0" expanded="true" />
- <element signature="e#5135#5136#0" expanded="true" />
- <element signature="e#5174#5175#0" expanded="true" />
- <element signature="e#5208#5209#0" expanded="true" />
- <element signature="e#5248#5249#0" expanded="true" />
- <element signature="e#5469#5470#0" expanded="true" />
- <element signature="e#5503#5504#0" expanded="true" />
- <element signature="e#5573#5574#0" expanded="true" />
- <element signature="e#5623#5624#0" expanded="true" />
- <element signature="e#5666#5667#0" expanded="true" />
- <element signature="e#5699#5700#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/client/ChatUpdate.java">
+ <entry file="file://$PROJECT_DIR$/../stuff/SharedWhiteBoard_TeamATM-master/src/SWBClient.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="663">
- <caret line="43" column="5" lean-forward="true" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
+ <state relative-caret-position="-544">
+ <caret line="16" column="3" lean-forward="true" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/MySharedKey.java">
+ <entry file="file://$PROJECT_DIR$/../stuff/distributed-board-master/src/main/java/com/walidmoustafa/board/App.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="34">
- <caret line="10" column="24" lean-forward="true" selection-end-line="41" />
+ <state relative-caret-position="187">
+ <caret line="115" column="15" lean-forward="true" selection-start-line="115" selection-start-column="15" selection-end-line="115" selection-end-column="15" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/IEncryptionUpdate.java">
+ <entry file="file://$PROJECT_DIR$/../stuff/distributed-board-server-master/src/main/java/com/walidmoustafa/board/server/BoardServer.java">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../stuff/distributed-board-server-master/src/main/java/com/walidmoustafa/board/server/BoardServerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="136">
- <caret line="10" lean-forward="true" selection-end-line="10" />
+ <state relative-caret-position="204">
+ <caret line="42" column="73" selection-start-line="42" selection-start-column="73" selection-end-line="42" selection-end-column="73" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/remote/IEncryptionUpdate.java">
+ <entry file="file://$PROJECT_DIR$/../RMIDemo/src/server/RMIServer.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="136">
- <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
- </state>
+ <state relative-caret-position="-306" />
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/IClientUpdate.java">
+ <entry file="file://$PROJECT_DIR$/../RMIDemo/src/server/RemoteMath.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
+ <state relative-caret-position="-641" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../RMIDemo/src/client/MathClient.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-153" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/server/security.policy">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="51">
+ <caret line="3" column="2" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/remote/IClientUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="68">
- <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+ <state relative-caret-position="2346">
+ <caret line="143" lean-forward="true" selection-start-line="143" selection-end-line="143" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/EncryptionUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/remote/IDrawingController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="5">
- <caret line="45" column="26" selection-start-line="45" selection-start-column="26" selection-end-line="45" selection-end-column="26" />
+ <state relative-caret-position="221">
+ <caret line="16" column="17" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/client/EncryptionUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/server/User.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="158">
- <caret line="54" column="9" lean-forward="true" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+ <state relative-caret-position="459">
+ <caret line="38" column="39" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ClientUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/server/DrawingController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1040" />
+ <state relative-caret-position="1105">
+ <caret line="90" column="6" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
+ </state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/client/ClientUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-139">
- <caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
+ <state relative-caret-position="-748">
+ <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ApplicationMain.java">
+ <entry file="file://$PROJECT_DIR$/src/client/DrawingUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-1159" />
+ <state relative-caret-position="289">
+ <caret line="31" column="20" lean-forward="true" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="20" />
+ </state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/ApplicationMain.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/StartScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="17">
- <caret line="40" selection-start-line="40" selection-end-line="40" />
+ <state>
+ <caret lean-forward="true" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/MySharedKey.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="221">
- <caret line="21" column="44" lean-forward="true" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
+ <state relative-caret-position="-819">
+ <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/ClientController.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/MenuBar.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-2610">
- <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="46" />
+ <state relative-caret-position="119">
+ <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
- <entry file="file://$USER_HOME$/AppData/Local/Temp/Temp1_SharedKeyDistribution (2).zip/SharedKeyDistribution/Client.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/PaintGUI.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="148" column="126" lean-forward="true" selection-start-line="148" selection-start-column="16" selection-end-line="148" selection-end-column="126" />
+ <state relative-caret-position="164">
+ <caret line="49" column="48" selection-start-line="49" selection-start-column="48" selection-end-line="49" selection-end-column="48" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/DrawingArea.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="232">
- <caret line="19" column="157" selection-start-line="19" selection-start-column="141" selection-end-line="19" selection-end-column="157" />
+ <state relative-caret-position="357">
+ <caret line="47" column="26" lean-forward="true" selection-start-line="47" selection-start-column="26" selection-end-line="47" selection-end-column="26" />
+ <folding>
+ <element signature="e#2140#2141#0" expanded="true" />
+ <element signature="e#2170#2171#0" expanded="true" />
+ <element signature="e#2215#2216#0" expanded="true" />
+ <element signature="e#2253#2254#0" expanded="true" />
+ <element signature="e#4829#4830#0" expanded="true" />
+ <element signature="e#4872#4873#0" expanded="true" />
+ <element signature="e#4905#4906#0" expanded="true" />
+ <element signature="e#4944#4945#0" expanded="true" />
+ <element signature="e#4979#4980#0" expanded="true" />
+ <element signature="e#5020#5021#0" expanded="true" />
+ <element signature="e#5058#5059#0" expanded="true" />
+ <element signature="e#5102#5103#0" expanded="true" />
+ <element signature="e#5135#5136#0" expanded="true" />
+ <element signature="e#5174#5175#0" expanded="true" />
+ <element signature="e#5208#5209#0" expanded="true" />
+ <element signature="e#5248#5249#0" expanded="true" />
+ <element signature="e#5469#5470#0" expanded="true" />
+ <element signature="e#5503#5504#0" expanded="true" />
+ <element signature="e#5573#5574#0" expanded="true" />
+ <element signature="e#5623#5624#0" expanded="true" />
+ <element signature="e#5666#5667#0" expanded="true" />
+ <element signature="e#5699#5700#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/remote/IClientController.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/ApplicationMain.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="119">
- <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+ <state relative-caret-position="646">
+ <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
+ <folding>
+ <element signature="imports" 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="317">
- <caret line="72" column="35" selection-start-line="72" selection-start-column="35" selection-end-line="72" selection-end-column="35" />
+ <state relative-caret-position="68">
+ <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/client/Client.java">
+ <entry file="file://$PROJECT_DIR$/src/client/ChatUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-187">
- <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
+ <state relative-caret-position="153">
+ <caret line="12" column="59" lean-forward="true" selection-start-line="12" selection-start-column="59" selection-end-line="12" selection-end-column="59" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/server/Server.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="226">
- <caret line="95" lean-forward="true" selection-start-line="95" selection-end-line="95" />
+ <state relative-caret-position="459">
+ <caret line="63" column="57" lean-forward="true" selection-start-line="63" selection-start-column="57" selection-end-line="63" selection-end-column="57" />
<folding>
- <element signature="e#825#826#0" expanded="true" />
- <element signature="e#865#866#0" expanded="true" />
+ <element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/client/Client.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="68">
+ <caret line="137" column="11" lean-forward="true" selection-start-line="137" selection-start-column="11" selection-end-line="137" selection-end-column="11" />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
diff --git a/out/production/infinitymonkeys/client/Client.class b/out/production/infinitymonkeys/client/Client.class
index 3f2a48517b6e5d45cb6e8d2880d95ec5f77d1f99..d58a0f4dec3fb5b6a32844731f4a2a7224fcb18d 100644
GIT binary patch
delta 2145
zcmbQKzDK?O)W2Q(7#J8V7=Cgx$TPHqhz=0Z$;BYg(8a|d#n27n_JD|95YflQ;K<O=
z!7u^DnaIH~2}Dn3XPCmpz{fBZ#F@s<FrAA*5W<<k&M=dUK?K5?#m+FBi$NU1nZwR7
zm#dyZieV}{!#pkq8HRq4=K1Ul3qV#c1QCna85VOeECFd*%EhpZVL6Dk0_3QbTnwui
zR&z0|VOR?y)`3*72N4@U#6~WLO$?hs#%<wX*vieYjbS@G!wwFHo$L&|I2d-bGwk7H
zSjMoIgJGX47sGyr0~`zog%}tZjtVg_G92Y*Fkv{(!EgdZpX6XT#m;bgvpnMyX7)4e
z3}@LH&TZym<z}q+U~uMP@B|SN43Rtx=?ob>44DjBJPbYzzB~+m4E{U}0StjW42290
zj0~KPdHH#jx%s8VJPb|@&WsG4Ir+(nIT`uIB|HqSAOYdzoXpg`5`AYd6<UyzSdt3T
ze4d9Ph#{DfK@cXNkyrwfWd})zFoaH?%_b=o#t_cP!0#UFsUKXDSX2_6T$Gxc$HNfC
z5Iy-En~|&=gF7PwFU$b21t6nSco^y#8YauK8z)_0NMUEV$ir}n;W7`y6@~^LhN}z>
z><rg<7_Nip8$1j*8De=DZZX{EVMu03;bDjYannG$?(i_&Ww^(~;Kkt0$iU~EkyzrK
zpI1_ppOceX#LjS^hv5OkLq-O%$^RL}CVyd%Q|DoL#PFDrLD0=V)Xzo1+21cD$lu4u
zH7J;!;Rz4JQ-%~q2Ij=1<jH;PVw%r57@qSmykL0A!SITQ;Wfh>Mh1ZZ$Kc>_{~#9y
zXAf6rZ&w!{hPMpwHYaiTGfwvA+BA71r_5wcE(Jj@hW88~7#Vm%i&Kjf@)C1XCqL%&
zn9Reyf$by6#IKVNaceSupZtb<E6Wc?2Gz-DdE_P^=FzowWME+6V-Nzx5(6WH3j+fK
z69X565Ga!1d>#fN1~&$Gu$%{jGnn>daGq?;>nzL!3U#m<jG#bbU}T7!+{i1Y9?!tQ
zz{bGHz`&rzkifvezyoHpG9)r2F)%PNf<hInb|0^JJxDDV0}}%SgFXW*g8^8*7?{rn
zRSz-?WHTcJBSR`fEJ!C<HHgo^z^b){foTKSSs<ez)|!BgLAN%IAqA@0j)4hcg;u@x
zRtBbxaP1J6STe9OSb>eebcrW}GXu!xbcPJ5VftV`#3jt=F0lg}gYJ?{hAgP&$(Q+%
z!^;s#IS17Lj11WfIUwbe1^C6l;RW%e8<JW?*yb|ifz+af5IefNys>J|XDGm;nFC3)
z5;!XTu<9;kNMT@Nh?{(zKQA2=7kUib3=9lG3@i+y3|tIi3<3<n45ADn42le)47v<q
z43-Sx46Y0j41o-h3^5E*U^5{B9t-t414ArB5jen$85kHi7?>GK7)lw+7&sZq87e?7
zojgat3>+kK4D1XH3<(U}42cZ<4CxF)49N__45<tf3~3B93>jdv6&RQqxEWX&DjAX(
z7#V~aI2o!Ks=@w|WvF4OWnf^aV_;xlXJ86qXHeo~U<8#IAWIk+7|ft?%%Qb~L2?^|
z8ghzJ1ts2G26l!#uq}|dMnqmCLj%Z=$z_7d)}T<~V_;@rU?^r_XDDG1WGF?_BLwv|
zBSRBIGe{2u1LFz?HU?G(28IihuLx?_Yw7G@(A&zOucftxL0`yVCxamq!vO}Ptqg1s
z5o4%`$yNq-h=?gv#B3`A$0i1IA&YGcmO@s3n;6WscQIHqFl=M6+{9q6yNkgF%+}h%
zz^=QK!Ip_(CW8q`z1=njOOT+p))ofg$>l<P_4aHGGZ}b6at_-VELqmDu3=we#lp6R
zftf*@;W)z?1|^0Q3@5?#DTdQvnwbIQ@gxQb1_p*&1}=tr27ZP{1`&p4204aS21SN8
z1~rBb25p9324jXP46Y1Q8NwN+F=R4KXDDQt$xy;Do1uYW4nq&aJcgMJ^$QplGAv}+
z$FP{;7{gMA6AUXEPBE-wIK!}!;T*#jaA=w^uri!uU;@W33n=WM;mW{pfdNvGfLNf6
z42ro63@r@K49wuT=V4&w7yHeykkOHyL5YExp%q*(v@v{PU|`^4U}X5j@J)i@GlL|<
SA#kb3#Bi8_k>LoKJO%(^7JkhD
delta 2164
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
diff --git a/out/production/infinitymonkeys/server/Server.class b/out/production/infinitymonkeys/server/Server.class
index 38120b2b114c5f043d06b010adce277e447bf251..44778baa93ab58de91fff49b859b54853e80acbe 100644
GIT binary patch
delta 171
zcmX>hc|vl-1Wrk51{MYx22KW91`!511_cIr1|0?k1`7to$tyYCSydTW8Pq0!<#c1z
znry=rB5KIM!C=h5!(hR{&tS?Rz+lcG!eBXhDc1^9dj@s}2L^5iCk8$SX9htA7Y0!V
zHwI}2cLqfU4+eDxF9rh!Zw5;S9|mWJNCt0)Xa;|Vn8{7tdt?(Bm>5zR*cdVyI2qCy
YxEL}R_!zPoWEpZ8bQp3cNAu(Y0OhqBb^rhX
delta 171
zcmX>hc|vl-1Wrjw1{MY>22KWP1`!4s1_cIL1|0@D1`7uH$tyYCS(O=B8B`{J<#c1z
zm~6upBC5~8!C=V1!(hh1&tS|Tz+lQC!eBmmDc1^9YX)`(8wPF$I|e=mdj>%U2L@3F
zCkAN-X9h(E7Y20(HwFU+cLqxa4+dujF9vT09|nI0-^oqfdt?I{m>5DC*chT1I2pnj
YxELZC_!wdsWEo-^bQt0$NAu(Y0Jy>#g#Z8m
diff --git a/src/client/ChatUpdate.java b/src/client/ChatUpdate.java
index 2edc3cc..8aebb48 100644
--- a/src/client/ChatUpdate.java
+++ b/src/client/ChatUpdate.java
@@ -48,5 +48,4 @@ public class ChatUpdate extends UnicastRemoteObject implements IChatUpdate, Seri
client.getApplicationMain().getChatScreen().getChatDisplayBox().append(fromClient + " has left the room.\n");
return true;
}
-
}
diff --git a/src/client/Client.java b/src/client/Client.java
index 7397f62..16c917e 100644
--- a/src/client/Client.java
+++ b/src/client/Client.java
@@ -6,8 +6,10 @@ import GUI.PaintGUI;
import GUI.StartScreen;
import remote.IChatController;
import remote.IClientController;
+import remote.IClientUpdate;
import remote.IDrawingController;
+import java.rmi.Naming;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
@@ -135,18 +137,27 @@ public class Client
try
{
- System.out.println("Server address: " + serverAddress);
+ //System.out.println("Server address: " + serverAddress);
registryServer = LocateRegistry.getRegistry(serverAddress);
+// String host = "Hais-MacBook-Pro.local:1099";
+// chatController = (IChatController) Naming.lookup("rmi://"+host+"/ChatController");
+// clientController = (IClientController) Naming.lookup("rmi://"+host+"/ClientController");
+// drawingController = (IDrawingController) Naming.lookup("rmi://"+host+"/DrawingController");
+
chatController = (IChatController) registryServer.lookup("ChatController");
clientController = (IClientController) registryServer.lookup("ClientController");
drawingController = (IDrawingController) registryServer.lookup("DrawingController");
+ System.out.println("FOUND CONTROLLERS");
+
+ password = "abc";
System.out.println("User name: " + userName);
System.out.println("Password: " + password);
if( clientController.checkPassword(password) )
{
+ System.out.println("PASSWORD CHECKED");
if( clientController.join(userName, this.chatUpdate, this.clientUpdate, this.drawingUpdate, this.encryptionUpdate) )
{
System.out.println("Connected to server");
diff --git a/src/server/Server.java b/src/server/Server.java
index cb1ef67..9c03b8c 100644
--- a/src/server/Server.java
+++ b/src/server/Server.java
@@ -5,7 +5,9 @@ import remote.IClientController;
import remote.IDrawingController;
import java.net.InetAddress;
+import java.net.MalformedURLException;
import java.net.UnknownHostException;
+import java.rmi.Naming;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
@@ -56,6 +58,8 @@ public class Server
public void run() throws RemoteException
{
+ //System.setProperty("java.security.policy","file:./security.policy");
+
LocateRegistry.createRegistry(1099);
Registry registry = LocateRegistry.getRegistry();
@@ -71,6 +75,17 @@ public class Server
registry.rebind(chatControllerName, chatController);
registry.rebind(drawingControllerName, drawingController);
+// try
+// {
+// Naming.rebind(clientControllerName, clientController);
+// Naming.rebind(chatControllerName, chatController);
+// Naming.rebind(drawingControllerName, drawingController);
+// }
+// catch (MalformedURLException e)
+// {
+// e.printStackTrace();
+// }
+
System.out.println("Server is ready");
printIP();
diff --git a/src/server/security.policy b/src/server/security.policy
new file mode 100644
index 0000000..35b5a07
--- /dev/null
+++ b/src/server/security.policy
@@ -0,0 +1,4 @@
+grant {
+ // Allow everything for now
+ permission java.security.AllPermission;
+};
\ No newline at end of file
--
GitLab