Merge branch 'master' of...

Merge branch 'master' of https://gitlab.eng.unimelb.edu.au/1050369/comp90015-dsass2-infinitymonkeys-remaster

src/GUI/ChatScreen.java

@@ -50,6 +50,7 @@ public class ChatScreen {
     public ChatScreen(Client client)
     {
         this.client = client;
+        activeDrawingUserBox = new JTextArea();
         yourNameDisplay.setText(client.getUserName());
         exitThisRoomButton.addActionListener(actionListener);
         sendButton.addActionListener(actionListener);

src/GUI/PaintGUI.java

@@ -142,13 +142,13 @@ public class PaintGUI extends JPanel {
         toolbox2.add(textSize);
         toolbox2.add(eraserBtn);
         toolbox2.add(eraserSizeOptions);
-        toolbox2.add(clearBtn);
 
 /// File control panel ///
         fileControl.add(newBtn);
         fileControl.add(openBtn);
         fileControl.add(saveBtn);
         fileControl.add(saveAsBtn);
+        fileControl.add(clearBtn);
 
 /// Layout ///
         toolbox.add(toolbox1, BorderLayout.NORTH);

src/client/DrawingUpdate.java

@@ -20,8 +20,9 @@ public class DrawingUpdate extends UnicastRemoteObject implements IDrawingUpdate
         this.client = client;
     }
 
-    public void notifyUserIsDrawing(String fromClient){
+    public boolean notifyUserIsDrawing(String fromClient) throws RemoteException {
         client.getApplicationMain().getChatScreen().getActiveDrawingUserBox().append(fromClient);
+        return true;
     }
 
     @Override

src/remote/IDrawingUpdate.java

@@ -11,5 +11,5 @@ public interface IDrawingUpdate extends Remote, Serializable {
     boolean notifyDraggingDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException;
     boolean notifyCanvasClearance(String fromClient) throws RemoteException;
     boolean receiveImage(byte[] rawImage) throws RemoteException;
-    public void notifyUserIsDrawing(String fromClient) throws RemoteException;
+    boolean notifyUserIsDrawing(String fromClient) throws RemoteException;
 }