Merge branch 'master' of...

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

src/client/UpdateController.java

-package client;
-
-import remote.IUpdateController;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import java.rmi.server.UnicastRemoteObject;
-import java.util.ArrayList;
-
-public class UpdateController extends UnicastRemoteObject implements IUpdateController, Serializable {
-    private ArrayList<String> userList;
-
-    protected UpdateController() throws RemoteException {
-        userList = new ArrayList<>();
-    }
-
-    @Override
-    public void updateClient(String text) throws RemoteException {
-        System.out.println("Client " + text + " just joined the server.");
-        userList.add(text);
-    }
-
-    @Override
-    public ArrayList<String> getUserList() throws RemoteException {
-        return userList;
-    }
-
-    @Override
-    public void updateUserList(ArrayList userList) throws RemoteException {
-        this.userList = userList;
-    }
-
-}

src/remote/IUpdateController.java

-package remote;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-
-/**
- * RMI Remote interface - IRemoteUpdate.
- * Allows Server to command Client to update: canvas, chat, other.
- */
-
-public interface IUpdateController extends Remote {
-
-    public void updateClient(String text) throws RemoteException;
-    public ArrayList<String> getUserList() throws RemoteException;
-    public void updateUserList(ArrayList userList) throws RemoteException;
-}

src/server/ServerDriver.java

-package server;
-
-import java.rmi.RemoteException;
-
-public class ServerDriver {
-    private ClientController clientController;
-    private DrawingController drawingController;
-
-//    private ServerDriver() throws RemoteException {
-//        try {
-//            this.clientController = new ClientController();
-//            this.drawingController = new DrawingController();
-//        }
-//        catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//
-//    }
-}