Fixed code

src/GUI/DrawingArea.java

@@ -292,9 +292,9 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
             if (currentMode == Mode.TEXT){
                 notifyUsingTimer();
             }
-            else {
-                drawingController.broadcastDrawingUserStopped(client.getUserName());
-            }
+//            else {
+//                drawingController.broadcastDrawingUserStopped(client.getUserName());
+//            }
 
         } catch (RemoteException ex) {
             ex.printStackTrace();
@@ -403,7 +403,7 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
         try {
             if (currentMode != Mode.TEXT){
                 drawingController.broadcastDraggingDrawing(client.getUserName(), drawing, currentMode.toString(), shapeColor, strokeSize);
-                drawingController.broadcastDrawingUser(client.getUserName());
+//                drawingController.broadcastDrawingUser(client.getUserName());
             }
 
         } catch (RemoteException ex) {

src/client/DrawingUpdate.java

@@ -74,6 +74,12 @@ public class DrawingUpdate extends UnicastRemoteObject implements IDrawingUpdate
         g2.setColor(color);
         client.getApplicationMain().getPaintGUI().getDrawingArea().repaint();
 
+        DefaultListModel temp = client.getApplicationMain().getChatScreen().getAllUserModel();
+        int elementIndex = -1;
+        if(temp.contains(fromClient)){
+            elementIndex = temp.indexOf(fromClient);
+            temp.remove(elementIndex);
+        }
         return true;
     }
 
@@ -96,6 +102,15 @@ public class DrawingUpdate extends UnicastRemoteObject implements IDrawingUpdate
                 break;
         }
         client.getApplicationMain().getPaintGUI().getDrawingArea().repaint();
+
+        DefaultListModel temp = client.getApplicationMain().getChatScreen().getAllUserModel();
+        if(temp.contains(fromClient)){
+            System.out.println("Already in the list");
+        }
+        else {
+            temp.addElement(fromClient);
+        }
+
         return true;
     }