diff --git a/.idea/modules.xml b/.idea/modules.xml
index 2e427f8517ddb10ed85217b5455d71f2f793816c..1fe4435f739a457406c6c8482d6bbcec0854e0aa 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,11 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
-<<<<<<< HEAD
<module fileurl="file://$PROJECT_DIR$/infinitymonkeys.iml" filepath="$PROJECT_DIR$/infinitymonkeys.iml" />
-=======
- <module fileurl="file://$PROJECT_DIR$/comp90015-dsass2-infinitymonkeys-remaster.iml" filepath="$PROJECT_DIR$/comp90015-dsass2-infinitymonkeys-remaster.iml" />
->>>>>>> 37a6af2e6d36ab514d01a93dbd5be6538a2572c7
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3cfaeba47baf68d9add8e3780696b5c6d4da1803..d977b687b3c340eccc8cf30a665528eea8e5f65f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,53 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/.idea/$PRODUCT_WORKSPACE_FILE$" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/comp90015-dsass2-infinitymonkeys-remaster.iml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/ChatScreen$1.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/ChatScreen.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/ColorPallete.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/DrawingArea$1.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/DrawingArea$Mode.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/DrawingArea.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/MenuBar.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/PaintGUI$1.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/PaintGUI.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/StartScreen$1.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/StartScreen.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/ToolBar.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/GUI/Tools.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/LICENSE" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/META-INF/comp90015-dsass2-infinitymonkeys-remaster.kotlin_module" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/client/ChatUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/client/Client.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/client/ClientUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/client/DrawingUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/AbstractLayout.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/DimensionInfo.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/GridConstraints.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/GridLayoutManager.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/HorizontalInfo.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/LayoutState.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/Spacer.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/SupportCode$TextWithMnemonic.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/SupportCode.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/Util.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/com/intellij/uiDesigner/core/VerticalInfo.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IChatController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IChatUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IClientController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IClientUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IDrawingController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/remote/IDrawingUpdate.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/server/ChatController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/server/ClientController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/server/DrawingController.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/server/Server.class" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/out/production/comp90015-dsass2-infinitymonkeys-remaster/server/User.class" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/GUI/ChatScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/ChatScreen.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/server/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/User.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -63,115 +19,11 @@
</component>
<component name="FileEditorManager">
<leaf>
- <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="-939">
- <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-85">
- <caret line="27" selection-start-line="27" selection-end-line="27" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/client/ClientUpdate.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="38" selection-start-line="38" selection-end-line="38" />
- </state>
- </provider>
- </entry>
- </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="208">
- <caret line="54" selection-start-line="54" selection-end-line="54" />
- <folding>
- <element signature="e#1789#2635#0" expanded="true" />
- <element signature="e#2634#2635#0" expanded="true" />
- <element signature="e#1716#1717#0" expanded="true" />
- <element signature="e#1779#1780#0" expanded="true" />
- <element signature="e#1823#1824#0" expanded="true" />
- <element signature="e#1860#1861#0" expanded="true" />
- <element signature="e#1915#1916#0" expanded="true" />
- <element signature="e#1959#1960#0" expanded="true" />
- <element signature="e#1998#1999#0" expanded="true" />
- <element signature="e#2033#2034#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">
- <state relative-caret-position="357">
- <caret line="25" column="65" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/server/User.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/remote/IClientController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="12" selection-start-line="12" selection-end-line="12" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/remote/IClientUpdate.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="12" selection-start-line="12" selection-end-line="12" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/client/Client.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="119">
- <caret line="133" column="104" selection-start-line="133" selection-start-column="104" selection-end-line="133" selection-end-column="104" />
- <folding>
- <element signature="e#892#893#0" expanded="true" />
- <element signature="e#923#924#0" expanded="true" />
- <element signature="e#969#970#0" expanded="true" />
- <element signature="e#1002#1003#0" expanded="true" />
- <element signature="e#1059#1060#0" expanded="true" />
- <element signature="e#1102#1103#0" expanded="true" />
- <element signature="e#1157#1158#0" expanded="true" />
- <element signature="e#1194#1195#0" expanded="true" />
- <element signature="e#1252#1253#0" expanded="true" />
- <element signature="e#1291#1292#0" expanded="true" />
- <element signature="e#1427#1428#0" expanded="true" />
- <element signature="e#1467#1468#0" expanded="true" />
- <element signature="e#1506#1507#0" expanded="true" />
- <element signature="e#1542#1543#0" expanded="true" />
- <element signature="e#1604#1605#0" expanded="true" />
- <element signature="e#1654#1655#0" expanded="true" />
- <element signature="e#3373#3374#0" expanded="true" />
- <element signature="e#3411#3412#0" expanded="true" />
- </folding>
+ <state relative-caret-position="323">
+ <caret line="81" selection-start-line="81" selection-end-line="81" />
</state>
</provider>
</entry>
@@ -209,12 +61,12 @@
<option value="$PROJECT_DIR$/src/server/ChatController.java" />
<option value="$PROJECT_DIR$/src/remote/IChatController.java" />
<option value="$PROJECT_DIR$/src/remote/IChatUpdate.java" />
- <option value="$PROJECT_DIR$/src/server/User.java" />
<option value="$PROJECT_DIR$/src/server/ClientController.java" />
<option value="$PROJECT_DIR$/src/remote/IClientController.java" />
<option value="$PROJECT_DIR$/src/client/ClientUpdate.java" />
<option value="$PROJECT_DIR$/src/remote/IClientUpdate.java" />
<option value="$PROJECT_DIR$/src/GUI/ChatScreen.form" />
+ <option value="$PROJECT_DIR$/src/server/User.java" />
<option value="$PROJECT_DIR$/src/GUI/ChatScreen.java" />
</list>
</option>
@@ -267,13 +119,6 @@
<item name="GUI" type="462c0819:PsiDirectoryNode" />
<item name="ChatScreen" type="e9f4de52:FormNode" />
</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="StartScreen" type="e9f4de52:FormNode" />
- </path>
<path>
<item name="infinitymonkeys" type="b2602c69:ProjectViewProjectNode" />
<item name="infinitymonkeys" type="462c0819:PsiDirectoryNode" />
@@ -367,7 +212,7 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1571631720382</updated>
- <workItem from="1571631723795" duration="16817000" />
+ <workItem from="1571631723795" duration="17601000" />
</task>
<task id="LOCAL-00001" summary="Changed the join method to send over a reference of the ClientUpdate Interface">
<created>1571646862883</created>
@@ -380,7 +225,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="16817000" />
+ <option name="totallyTimeSpent" value="17601000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1295" height="704" extended-state="6" />
@@ -394,7 +239,7 @@
<window_info id="JavaEE:App" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24939272" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Terminal" visible="true" weight="0.124125876" />
+ <window_info anchor="bottom" id="Terminal" visible="true" weight="0.26923078" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.32867134" />
@@ -484,17 +329,44 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/User.java">
+ <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.form">
+ <provider selected="true" editor-type-id="ui-designer" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/needsDebugging/client/ChatUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="68">
+ <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/client/ClientUpdate.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="663">
+ <caret line="39" column="31" lean-forward="true" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
+ <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="-939">
+ <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/remote/IClientController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
- <caret line="13" selection-start-line="13" selection-end-line="13" />
+ <caret line="12" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/client/ChatUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/remote/IClientUpdate.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="25" column="65" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
+ <state relative-caret-position="170">
+ <caret line="12" selection-start-line="12" selection-end-line="12" />
</state>
</provider>
</entry>
@@ -525,67 +397,34 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/server/ChatController.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-939">
- <caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/remote/IClientUpdate.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="12" selection-start-line="12" selection-end-line="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/client/ClientUpdate.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="38" selection-start-line="38" selection-end-line="38" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.form">
- <provider selected="true" editor-type-id="ui-designer" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/remote/IClientController.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="12" selection-start-line="12" selection-end-line="12" />
+ <state relative-caret-position="114">
+ <caret line="25" column="65" selection-start-line="25" selection-start-column="65" selection-end-line="25" selection-end-column="65" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/needsDebugging/client/ChatUpdate.java">
+ <entry file="file://$PROJECT_DIR$/src/server/User.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="68">
- <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+ <state relative-caret-position="186">
+ <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/server/ClientController.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-85">
- <caret line="27" selection-start-line="27" selection-end-line="27" />
+ <state relative-caret-position="-1602">
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GUI/ChatScreen.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="208">
- <caret line="54" selection-start-line="54" selection-end-line="54" />
- <folding>
- <element signature="e#1789#2635#0" expanded="true" />
- <element signature="e#2634#2635#0" expanded="true" />
- <element signature="e#1716#1717#0" expanded="true" />
- <element signature="e#1779#1780#0" expanded="true" />
- <element signature="e#1823#1824#0" expanded="true" />
- <element signature="e#1860#1861#0" expanded="true" />
- <element signature="e#1915#1916#0" expanded="true" />
- <element signature="e#1959#1960#0" expanded="true" />
- <element signature="e#1998#1999#0" expanded="true" />
- <element signature="e#2033#2034#0" expanded="true" />
- </folding>
+ <state relative-caret-position="323">
+ <caret line="81" selection-start-line="81" selection-end-line="81" />
</state>
</provider>
</entry>
diff --git a/src/GUI/ChatScreen.java b/src/GUI/ChatScreen.java
index ea27c84169a4c9b1b768ebfc90143fec14cb783f..8dda5bb827736fa34432e329ad2647adec928766 100644
--- a/src/GUI/ChatScreen.java
+++ b/src/GUI/ChatScreen.java
@@ -54,8 +54,6 @@ public class ChatScreen {
frame.setVisible(true);
SwingUtilities.getRootPane(sendButton).setDefaultButton(sendButton);
-<<<<<<< HEAD
-=======
frame.addWindowListener(new WindowAdapter()
{
@@ -82,7 +80,6 @@ public class ChatScreen {
}
});
->>>>>>> mpriymak
}
private void createUIComponents() {
diff --git a/src/server/User.java b/src/server/User.java
index c3d29863b355157e0c3c43e4e360792de33bcb51..ef27d0aa114e4364360cf9ece61c6d2c6dfafabb 100644
--- a/src/server/User.java
+++ b/src/server/User.java
@@ -7,21 +7,12 @@ import remote.IDrawingUpdate;
public class User
{
private String username;
-<<<<<<< HEAD
private remote.IChatUpdate IChatUpdate;
private remote.IDrawingUpdate IDrawingUpdate;
private remote.IClientUpdate IClientUpdate;
private boolean isAdmin;
-
public User(String username, remote.IChatUpdate IChatUpdate, remote.IClientUpdate IClientUpdate, remote.IDrawingUpdate IDrawingUpdate)
-=======
- private IChatUpdate IChatUpdate;
- private IDrawingUpdate IDrawingUpdate;
- private IClientUpdate IClientUpdate;
- private boolean isAdmin;
- public User(String username, IChatUpdate IChatUpdate, IClientUpdate IClientUpdate, IDrawingUpdate IDrawingUpdate)
->>>>>>> mpriymak
{
this.username = username;
this.IChatUpdate = IChatUpdate;
@@ -50,16 +41,11 @@ public class User
return this.IChatUpdate;
}
-<<<<<<< HEAD
public remote.IClientUpdate getIClientUpdate()
{
return this.IClientUpdate;
}
public remote.IDrawingUpdate getIDrawingUpdate() { return this.IDrawingUpdate; }
-=======
- public IDrawingUpdate getIDrawingUpdate() { return this.IDrawingUpdate; }
- public IClientUpdate getIClientUpdate() { return this.IClientUpdate; }
->>>>>>> mpriymak
}