From f78c86e4b595f0fcbad4796ed5d187f2d9bb0c9c Mon Sep 17 00:00:00 2001
From: Hai HoDac <hhodac@student.unimelb.edu.au>
Date: Thu, 24 Oct 2019 22:33:18 +1100
Subject: [PATCH] fixed notifyUserDrawing exception
---
src/GUI/ChatScreen.java | 1 +
src/GUI/PaintGUI.java | 2 +-
src/client/DrawingUpdate.java | 3 ++-
src/remote/IDrawingUpdate.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/GUI/ChatScreen.java b/src/GUI/ChatScreen.java
index f5f694a..e98608c 100644
--- a/src/GUI/ChatScreen.java
+++ b/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);
diff --git a/src/GUI/PaintGUI.java b/src/GUI/PaintGUI.java
index 7f8e024..78265a9 100644
--- a/src/GUI/PaintGUI.java
+++ b/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);
diff --git a/src/client/DrawingUpdate.java b/src/client/DrawingUpdate.java
index c2941d4..0b9d086 100644
--- a/src/client/DrawingUpdate.java
+++ b/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
diff --git a/src/remote/IDrawingUpdate.java b/src/remote/IDrawingUpdate.java
index 73d1d84..cd06602 100644
--- a/src/remote/IDrawingUpdate.java
+++ b/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;
}
--
GitLab