Merge branch 'master' of...

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

src/client/Client.java

@@ -20,15 +20,13 @@ public class Client
     private Registry registryServer;
     private IChatController chatController;
     private IClientController clientController;
-
     private IDrawingController drawingController;
 
     private ClientUpdate clientUpdate;
-
     private ChatUpdate chatUpdate;
     private DrawingUpdate drawingUpdate;
-    private StartScreen startScreen;
 
+    private StartScreen startScreen;
     private ChatScreen chatScreen;
     private PaintGUI paintGUI;
 
@@ -41,12 +39,6 @@ public class Client
 
     public ChatScreen getChatScreen() { return chatScreen; }
 
-    public void setConnectedUsers(String[] users)
-    {
-        this.connectedUsers = users;
-    }
-
-
     public IChatController getChatController()
     {
         return chatController;
@@ -103,22 +95,6 @@ public class Client
         }
     }
 
-//    public void doSomething()
-//    {
-////        new ChatScreen();
-//
-//        try
-//        {
-//            new ChatScreen(this);
-//            System.out.println("Sleeping...");
-//            TimeUnit.MINUTES.sleep(5);
-//        }
-//        catch(Exception e)
-//        {
-//            e.printStackTrace();
-//        }
-//    }
-
     public boolean connect()
     {
         try
@@ -143,14 +119,4 @@ public class Client
 
         return false;
     }
-
-    public String getReceivedMessage()
-    {
-        return receivedMessage;
-    }
-
-    public void setReceivedMessage(String receivedMessage)
-    {
-        this.receivedMessage = receivedMessage;
-    }
 }
\ No newline at end of file

src/server/ClientController.java

 package server;
 
 import remote.IChatUpdate;
-import remote.IClientController;
 import remote.IClientUpdate;
 import remote.IDrawingUpdate;
+import remote.IClientController;
 
 import java.io.Serializable;
 import java.rmi.Remote;

src/server/User.java

@@ -7,11 +7,10 @@ import remote.IDrawingUpdate;
 public class User
 {
     private String username;
-    private remote.IChatUpdate IChatUpdate;
-    private remote.IDrawingUpdate IDrawingUpdate;
-    private remote.IClientUpdate IClientUpdate;
+    private IChatUpdate IChatUpdate;
+    private IDrawingUpdate IDrawingUpdate;
+    private IClientUpdate IClientUpdate;
     private boolean isAdmin;
-    public User(String username, remote.IChatUpdate IChatUpdate, remote.IClientUpdate IClientUpdate, remote.IDrawingUpdate IDrawingUpdate)
 
     public User(String username, IChatUpdate IChatUpdate, IClientUpdate IClientUpdate, IDrawingUpdate IDrawingUpdate)
     {
@@ -42,11 +41,7 @@ public class User
         return this.IChatUpdate;
     }
 
-    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; }
 }