Some merge bugs fixed

494bb0d8 · Pedroza Aguirre Isaac · 6f42314c · 494bb0d8 · 494bb0d8 · 494bb0d8
Commit 494bb0d8 authored Oct 24, 2019 by Pedroza Aguirre Isaac
--- a/out/production/infinitymonkeys/client/DrawingUpdate.class
+++ b/out/production/infinitymonkeys/client/DrawingUpdate.class
--- a/out/production/infinitymonkeys/client/EncryptionUpdate.class
+++ b/out/production/infinitymonkeys/client/EncryptionUpdate.class
--- a/out/production/infinitymonkeys/client/client.policy
+++ b/out/production/infinitymonkeys/client/client.policy
+grant {
+        permission java.net.SocketPermission "10.13.64.162", "accept,connect";
+};
--- a/out/production/infinitymonkeys/remote/IClientController.class
+++ b/out/production/infinitymonkeys/remote/IClientController.class
--- a/out/production/infinitymonkeys/remote/IDrawingController.class
+++ b/out/production/infinitymonkeys/remote/IDrawingController.class
--- a/out/production/infinitymonkeys/remote/IDrawingUpdate.class
+++ b/out/production/infinitymonkeys/remote/IDrawingUpdate.class
--- a/out/production/infinitymonkeys/remote/IEncryptionUpdate.class
+++ b/out/production/infinitymonkeys/remote/IEncryptionUpdate.class
--- a/out/production/infinitymonkeys/server/ClientController$1.class
+++ b/out/production/infinitymonkeys/server/ClientController$1.class
--- a/out/production/infinitymonkeys/server/ClientController.class
+++ b/out/production/infinitymonkeys/server/ClientController.class
--- a/out/production/infinitymonkeys/server/DrawingController.class
+++ b/out/production/infinitymonkeys/server/DrawingController.class
--- a/out/production/infinitymonkeys/server/MySharedKey.class
+++ b/out/production/infinitymonkeys/server/MySharedKey.class
--- a/out/production/infinitymonkeys/server/Server.class
+++ b/out/production/infinitymonkeys/server/Server.class
--- a/out/production/infinitymonkeys/server/server.policy
+++ b/out/production/infinitymonkeys/server/server.policy
+grant codeBase "file:/Users/haiho/OneDrive - The University of Melbourne/Distributed Systems (COMP90015)/Assignment 2/InfinityMonkeys-remaster/comp90015-dsass2-infinitymonkeys-remaster/out/production/comp90015-dsass2-infinitymonkeys-remaster/" {
+    permission java.security.AllPermission;
+};
\ No newline at end of file
--- a/src/GUI/ChatScreen.java
+++ b/src/GUI/ChatScreen.java
@@ -11,6 +11,7 @@ import java.rmi.RemoteException;
 public class ChatScreen {

    public JPanel panel2;
+    public JPanel othersPanel;

    private JButton sendButton;