All works so far

src/GUI/ApplicationMain.java

@@ -9,10 +9,10 @@ import java.awt.event.WindowEvent;
 import java.rmi.RemoteException;
 
 public class ApplicationMain extends JPanel {
-    Client client;
-    ChatScreen chatScreen;
-    PaintGUI paintGUI;
-    JFrame frame;
+    private Client client;
+    private ChatScreen chatScreen;
+    private PaintGUI paintGUI;
+    private JFrame frame;
 
     public ChatScreen getChatScreen() { return chatScreen; }
 
@@ -28,37 +28,45 @@ public class ApplicationMain extends JPanel {
         this.paintGUI = new PaintGUI(client);
     }
 
-    public void createAndShowGUI() {
+    public void createAndShowGUI()
+    {
         frame = new JFrame("Application Main");
         JFrame.setDefaultLookAndFeelDecorated(true);
         Container content = frame.getContentPane();
         content.setLayout(new BorderLayout());
         content.add(paintGUI.getGlobal(), BorderLayout.WEST);
         content.add(chatScreen.panel2, BorderLayout.EAST);
-        SwingUtilities.getRootPane(chatScreen.getSendButton()).setDefaultButton(chatScreen.getSendButton());
+        chatScreen.setUserName(client.getUserName());
 
+        SwingUtilities.getRootPane(chatScreen.getSendButton()).setDefaultButton(chatScreen.getSendButton());
         frame.addWindowListener(new WindowAdapter()
         {
             @Override
             public void windowClosing(WindowEvent arg0)
             {
-                int answer = JOptionPane.showConfirmDialog(null,
+                int reply = JOptionPane.showConfirmDialog(null,
                         "Are you sure you want to quit the session?",
                         "Shut down session", JOptionPane.YES_NO_OPTION);
-                System.out.println(answer);
-                if (answer == 0)
+
+                if( reply == JOptionPane.YES_OPTION )
                 {
-                    System.out.println("Quitting session");
                     try
                     {
                         client.getClientController().quit(client.getUserName());
                     }
                     catch (RemoteException e)
                     {
-                        e.printStackTrace();
+                        StartScreen.showErrorMessage("Error in quitting the server");
+                        //e.printStackTrace();
                     }
+
                     System.exit(0);
                 }
+
+                if( reply == JOptionPane.NO_OPTION )
+                {
+                    //do nothing
+                }
             }
         });
 
@@ -69,5 +77,4 @@ public class ApplicationMain extends JPanel {
         frame.pack();
         frame.setVisible(true);
     }
-
 }

src/GUI/ChatScreen.form

@@ -67,7 +67,7 @@
                 <properties/>
                 <border type="none" title="Manager's Tools"/>
                 <children>
-                  <component id="b7068" class="javax.swing.JComboBox" binding="userSelectComboBox">
+                  <component id="b7068" class="javax.swing.JComboBox" binding="kickUserComboBox">
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
                     </constraints>

src/GUI/ChatScreen.java

@@ -14,11 +14,10 @@ public class ChatScreen {
 
     private JButton sendButton;
 
-    //    private JPanel drawingPanel;
     private JPanel othersPanel;
     private JComboBox sendMessageToComboBox;
     private JTextArea chatDisplayBox;
-    private JComboBox userSelectComboBox;
+    private JComboBox kickUserComboBox;
     private JButton kickOutButton;
     private JButton promoteToManagerButton;
     private JTextField chatInputBox;
@@ -33,29 +32,33 @@ public class ChatScreen {
     private JButton exitThisRoomButton;
     private JButton quitButton;
     private JFrame frame;
+
     public Client getClient() {
         return client;
     }
 
     public Client client;
 
-
     public ChatScreen(Client client)
     {
         this.client = client;
+        yourNameDisplay.setText(client.getUserName());
         exitThisRoomButton.addActionListener(actionListener);
+        quitButton.addActionListener(actionListener);
         sendButton.addActionListener(actionListener);
-        yourNameDisplay.setText(client.getUserName());
-//        drawingPanel = new PaintGUI(client);
-//        SwingUtilities.getRootPane(sendButton).setDefaultButton(sendButton);
+        kickOutButton.addActionListener(actionListener);
+        promoteToManagerButton.addActionListener(actionListener);
     }
 
+    public void setUserName(String userName)
+    {
+        this.yourNameDisplay.setText(userName);
+    }
 
     public JButton getSendButton() {
         return sendButton;
     }
 
-
     public JTextArea getChatDisplayBox() {
         return chatDisplayBox;
     }
@@ -65,10 +68,27 @@ public class ChatScreen {
         return sendMessageToComboBox;
     }
 
-//    public JPanel getDrawingPanel() {
-//        return drawingPanel;
-//    }
+    public JComboBox getKickUserComboBox()
+    {
+        return kickUserComboBox;
+    }
+
+    public void setManagerToolsVisibility() {
+        try {
+            if (client.getClientController().getAdmin().equals(client.getUserName())){
+                managersPanel.setVisible(true);
+            }
+            else {
+                managersPanel.setVisible(false);
+            }
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+    }
 
+    public void exitChatScreen() {
+        System.exit(0);
+    }
 
     ActionListener actionListener = new ActionListener()
     {
@@ -106,13 +126,44 @@ public class ChatScreen {
                 {
                     System.out.println("Exit room button pressed");
                     clientController.quit(client.getUserName());
-                    System.exit(0);
+                    exitChatScreen();
                 }
                 catch (RemoteException ex)
                 {
                     ex.printStackTrace();
                 }
             }
+            else if (e.getSource() == kickOutButton)
+            {
+
+                IClientController clientController = client.getClientController();
+                String toUser = kickUserComboBox.getSelectedItem().toString();
+
+                try {
+                    System.out.println("Kick out button pressed");
+                    clientController.kickUser(client.getUserName(), toUser);
+                }
+                catch (RemoteException ex) {
+
+                    ex.printStackTrace();
+                }
+
+            }
+            else if (e.getSource() == promoteToManagerButton)
+            {
+
+                IClientController clientController = client.getClientController();
+                String toUser = kickUserComboBox.getSelectedItem().toString();
+
+                try {
+                    System.out.println("Promote to manager button pressed");
+                    clientController.assignAdmin(client.getUserName(), toUser);
+                }
+                catch (RemoteException ex) {
+                    ex.printStackTrace();
+                }
+
+            }
         }
 
     };

src/GUI/StartScreen.java

@@ -33,32 +33,42 @@ public class StartScreen {
         {
             if (e.getSource() == joinButton)
             {
-                client.setServerAddress(textField2.getText());
-                client.setUsername(textField1.getText());
+                String serverAddress = textField2.getText();
+                String userName = textField1.getText();
 
-                if( client.connect() )
+                int connectionStatus = client.connect(userName, serverAddress);
+
+                if( connectionStatus == 1 )
                 {
                     frame.setVisible(false);
                     frame.dispose();
-                    //client.doSomething();
-                    new ChatScreen(client);
+                    client.startApplication();
+                }
+                else if( connectionStatus == 2 )
+                {
+                    showErrorMessage("Duplicate username: Please enter a new username");
+                }
+                else if( connectionStatus == 3 )
+                {
+                    showErrorMessage("Cannot connect to server: Please check the server address");
                 }
                 else
                 {
-                    showErrorMessage("Could not connect to server...");
+                    showErrorMessage("Unknown Connection Status");
                 }
             }
         }
 
     };
 
-    private void showErrorMessage(String message)
+    public static void showErrorMessage(String message)
     {
         JOptionPane.showMessageDialog(null,
-                message, "Error", JOptionPane.PLAIN_MESSAGE);
+                message, "Error", JOptionPane.ERROR_MESSAGE);
     }
 
-    public void go(){
+    public void go()
+    {
         joinButton.addActionListener(actionListener);
         frame = new JFrame("StartScreen");
         frame.setContentPane(panel1);

src/client/Client.java

@@ -14,6 +14,9 @@ import java.rmi.registry.Registry;
 
 public class Client
 {
+    private final String DEFAULT_USERNAME = "Anonymous";
+    private final String DEFAULT_SERVER_ADDRESS = "localhost";
+
     private String userName;
     private String serverAddress;
 
@@ -27,17 +30,40 @@ public class Client
     private DrawingUpdate drawingUpdate;
 
     private StartScreen startScreen;
-    private ChatScreen chatScreen;
     private PaintGUI paintGUI;
 
-    public ApplicationMain getApplicationMain() { return applicationMain; }
+
+    public String getUserName()
+    {
+        return this.userName;
+    }
+
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getServerAddress()
+    {
+        return serverAddress;
+    }
+
+    public void setServerAddress(String serverAddress)
+    {
+        this.serverAddress = serverAddress;
+    }
 
     private ApplicationMain applicationMain;
 
-    public PaintGUI getPaintGUI() { return paintGUI; }
+    public ApplicationMain getApplicationMain() { return applicationMain; }
 
+    public PaintGUI getPaintGUI() {
+        return paintGUI;
+    }
 
-    public ChatScreen getChatScreen() { return chatScreen; }
+    public ChatScreen getChatScreen() {
+        return getApplicationMain().getChatScreen();
+    }
 
     public IChatController getChatController()
     {
@@ -51,20 +77,6 @@ public class Client
 
     public IDrawingController getDrawingController() { return drawingController; }
 
-    public void setUsername(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getUserName()
-    {
-        return this.userName;
-    }
-
-    public void setServerAddress(String serverAddress)
-    {
-        this.serverAddress = serverAddress;
-    }
 
     public Client(String username) throws RemoteException
     {
@@ -72,11 +84,8 @@ public class Client
         this.clientUpdate = new ClientUpdate(this);
         this.chatUpdate = new ChatUpdate(this);
         this.drawingUpdate = new DrawingUpdate(this);
-//        this.startScreen = new StartScreen(this);
-//        this.chatScreen = new ChatScreen(this);
-//        this.paintGUI = new PaintGUI(this);
+        this.startScreen = new StartScreen(this);
         this.applicationMain = new ApplicationMain(this);
-
     }
 
     public static void main(String[] args)
@@ -84,38 +93,72 @@ public class Client
         try
         {
             Client client = new Client(args[0]);
-            client.connect();
-//            client.getApplicationMain().getPaintGUI().getDrawingArea().setImage(client.drawingController.getCurrentImage());
-            client.getApplicationMain().createAndShowGUI();
+            client.showStartScreen();
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            StartScreen.showErrorMessage("Error starting up client");
         }
     }
 
-    public boolean connect()
+
+    public void showStartScreen()
     {
+        startScreen.go();
+    }
+
+
+    public void startApplication()
+    {
+        applicationMain.createAndShowGUI();
+        applicationMain.getChatScreen().setManagerToolsVisibility();
+    }
+
+    // return = 1 -> connected successfully
+    // return = 2 -> duplicate username
+    // return = 3 -> error in locating the server
+    public int connect(String userName, String serverAddress)
+    {
+        if( !userName.trim().isEmpty() )
+        {
+            setUserName(userName);
+        }
+        userName = getUserName();
+
+        if( serverAddress.trim().isEmpty() )
+        {
+            serverAddress = DEFAULT_SERVER_ADDRESS;
+            setServerAddress(serverAddress);
+        }
+        setServerAddress(serverAddress);
+
         try
         {
+            System.out.println("Server address:" + serverAddress);
             registryServer = LocateRegistry.getRegistry(serverAddress);
 
             chatController = (IChatController) registryServer.lookup("ChatController");
             clientController = (IClientController) registryServer.lookup("ClientController");
             drawingController = (IDrawingController) registryServer.lookup("DrawingController");
 
+            System.out.println("User name:" + userName);
             if( clientController.join(userName, this.chatUpdate, this.clientUpdate, this.drawingUpdate) )
             {
                 System.out.println("Connected to server");
 
-                return true;
+                return 1;
+            }
+            else
+            {
+                return 2;
             }
         }
         catch (Exception e)
         {
-            e.printStackTrace();
-        }
+            //e.printStackTrace();
 
-        return false;
+            return 3;
+        }
     }
+
 }
\ No newline at end of file

src/client/ClientUpdate.java

@@ -18,7 +18,6 @@ public class ClientUpdate extends UnicastRemoteObject implements IClientUpdate,
         this.client = client;
     }
 
-    @Override
     public boolean notifyClient(String fromClient, String newUsername) throws RemoteException
     {
         client.getApplicationMain().getChatScreen().getSendMessageToComboBox().addItem(newUsername);
@@ -26,25 +25,70 @@ public class ClientUpdate extends UnicastRemoteObject implements IClientUpdate,
         return true;
     }
 
+    // for debuggins purposes
+    private void printUserList(String[] users)
+    {
+        System.out.print("Currently connected users: ");
+        for( String s : users )
+        {
+            System.out.print(s + " ");
+        }
+        System.out.println();
+    }
+
     @Override
     public boolean updateUserList(String[] users) throws RemoteException
     {
-        //client.setConnectedUsers(users);
+        printUserList(users);
 
+        System.out.println("TEST1");
         JComboBox userBox = client.getApplicationMain().getChatScreen().getSendMessageToComboBox();
+        JComboBox kickUserBox = client.getChatScreen().getKickUserComboBox();
 
+        System.out.println("TEST2");
         userBox.removeAllItems();
+        kickUserBox.removeAllItems();
 
+        System.out.println("TEST3");
         userBox.addItem("All");
 
+        System.out.println("TEST4");
         for( String s : users )
         {
             if( !s.equals(client.getUserName()) )
             {
                 userBox.addItem(s);
             }
+
+            if( !s.equals(client.getClientController().getAdmin()) )
+            {
+                kickUserBox.addItem(s);
+            }
+
         }
 
         return true;
     }
+
+    @Override
+    public void terminateChat() throws RemoteException {
+        client.getChatScreen().exitChatScreen();
+    }
+
+    @Override
+    public void setVisibility() {
+        client.getChatScreen().setManagerToolsVisibility();
+    }
+
+    @Override
+    public void notifyManagerActions(String toClient, Action action) throws RemoteException {
+        switch (action) {
+            case KICKOUT:
+                client.getChatScreen().getChatDisplayBox().append(toClient + " has been kicked out by the manager.\n");
+                break;
+            case ASSIGNADMIN:
+                client.getChatScreen().getChatDisplayBox().append(toClient + " is the new manager.\n");
+                break;
+        }
+    }
 }

src/client/DrawingUpdate.java

@@ -4,10 +4,6 @@ import GUI.DrawingArea;
 import remote.IDrawingUpdate;
 
 import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Line2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RectangularShape;
 import java.io.Serializable;
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;

src/remote/IClientController.java

@@ -5,11 +5,17 @@ import java.rmi.RemoteException;
 
 public interface IClientController extends Remote
 {
+    enum Action {KICKOUT, ASSIGNADMIN};
+
     boolean join(String username, IChatUpdate clientChat, IClientUpdate clientUpdate, IDrawingUpdate clientDrawing) throws RemoteException;
 
     void quit(String username) throws RemoteException;
 
-    boolean assignAdmin(String username) throws RemoteException;
+    boolean assignAdmin(String oldAdmin, String newAdmin) throws RemoteException;
 
     boolean kickUser(String username, String who) throws RemoteException;
+
+    boolean broadcastManagerMessage(String toClient, Action action) throws RemoteException;
+
+    String getAdmin() throws RemoteException;
 }

src/remote/IClientUpdate.java

@@ -6,7 +6,10 @@ import java.rmi.RemoteException;
 
 public interface IClientUpdate extends Remote, Serializable {
 
-    boolean notifyClient(String fromClient, String newUsername) throws RemoteException;
-
+    enum Action {KICKOUT, ASSIGNADMIN};
     boolean updateUserList(String[] users) throws RemoteException;
+    void terminateChat() throws RemoteException;
+    void notifyManagerActions(String toClient, Action action) throws RemoteException;
+    void setVisibility() throws RemoteException;
+
 }

src/server/ChatController.java

@@ -6,17 +6,14 @@ import remote.IChatUpdate;
 import java.io.Serializable;
 import java.rmi.RemoteException;
 import java.rmi.server.UnicastRemoteObject;
-import java.util.ArrayList;
 
 public class ChatController extends UnicastRemoteObject implements IChatController, Serializable
 {
     private Server server;
-    private ArrayList<String> messages;
 
     public ChatController(Server server) throws RemoteException
     {
         this.server = server;
-        this.messages = new ArrayList<>();
     }
 
     @Override
@@ -24,12 +21,9 @@ public class ChatController extends UnicastRemoteObject implements IChatControll
     {
         System.out.print("Broadcasting message to everyone...");
 
-        IChatUpdate client;
-
         for( User u : server.users )
         {
-            client = u.getIChatUpdate();
-            client.notifyChat(fromClient, message, false);
+            u.getIChatUpdate().notifyChat(fromClient, message, false);
         }
 
         System.out.print("...DONE\n");

src/server/ClientController.java

@@ -22,6 +22,9 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
     @Override
     public boolean join(String username, IChatUpdate clientChat, IClientUpdate clientUpdate, IDrawingUpdate clientDrawing) throws RemoteException
     {
+        if( getUserIndex(username) < 0 )
+        {
+            // user with same username is not connected
             server.chatController.broadcastMessageUserLogin(username);
 
             User newUser = new User(username, clientChat, clientUpdate, clientDrawing);
@@ -30,7 +33,7 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
 
             if(server.users.size() == 1)
             {
-            server.users.get(0).setAdmin(true);
+                newUser.setAdmin(true);
             }
 
             System.out.println(username + " registered successfully");
@@ -39,6 +42,11 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
 
             return true;
         }
+        else
+        {
+            return false;
+        }
+    }
 
     @Override
     public void quit(String username) throws RemoteException
@@ -53,16 +61,33 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
 
             broadcastUserList();
         }
+
+        printUserList();
+    }
+
+    // for debuggins purposes
+    private void printUserList()
+    {
+        System.out.print("Currently connected users: ");
+        for( User u : server.users )
+        {
+            System.out.print(u.getUserName());
+        }
+        System.out.println();
     }
 
     @Override
-    public boolean assignAdmin(String username) throws RemoteException
+    public boolean assignAdmin(String oldAdmin, String newAdmin) throws RemoteException
     {
-        int adminIndex = getUserIndex(username);
+        int oldAdminIndex = getUserIndex(oldAdmin);
+        int newAdminIndex = getUserIndex(newAdmin);
 
-        if( adminIndex >= 0 )
+        if( newAdminIndex >= 0 && server.users.get(oldAdminIndex).isAdmin())
         {
-            server.users.get(adminIndex).setAdmin(true);
+            server.users.get(oldAdminIndex).setAdmin(false);
+            server.users.get(newAdminIndex).setAdmin(true);
+            broadcastUserList();
+            broadcastManagerMessage(newAdmin, Action.ASSIGNADMIN);
 
             return true;
         }
@@ -71,17 +96,25 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
     }
 
     @Override
-    public boolean kickUser(String username, String who) throws RemoteException
+    public boolean kickUser(String manager, String kickedUser) throws RemoteException
     {
-        int userIndex = getUserIndex(who);
+        int userIndex = getUserIndex(kickedUser);
 
-        int adminIndex = getUserIndex(username);
+        int adminIndex = getUserIndex(manager);
 
-        if ( adminIndex > 0 && userIndex > 0 && server.users.get(adminIndex).isAdmin() )
+        if ( adminIndex >= 0 && userIndex >= 0 && server.users.get(adminIndex).isAdmin() )
         {
-            server.users.remove(userIndex);
 
+            try {
+                server.users.get(userIndex).getIClientUpdate().terminateChat();
+            }
+            finally {
+                System.out.print(server.users);
+                server.users.remove(userIndex);
+                System.out.print(server.users);
                 broadcastUserList();
+                broadcastManagerMessage(kickedUser, Action.KICKOUT);
+            }
 
             return true;
         }
@@ -105,18 +138,68 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
         return index;
     }
 
-    private void broadcastUserList() throws RemoteException
+    public void broadcastUserList() throws RemoteException
     {
-        String[] connectedUsers = new String[server.users.size()];
 
+        String[] connectedUsers = new String[server.users.size()];
         for( int i = 0; i<server.users.size(); i++ )
         {
             connectedUsers[i] = server.users.get(i).getUserName();
         }
 
+        printUserList();
+
         for( User u : server.users )
         {
+            System.out.print(u.getUserName() + " being notified");
             u.getIClientUpdate().updateUserList(connectedUsers);
+            System.out.println("...DONE");
+        }
+    }
+
+    @Override
+    public String getAdmin() throws RemoteException
+    {
+        String adminName = "";
+        for( User u : server.users )
+        {
+            if (u.isAdmin()) {
+                adminName = u.getUserName();
+            }
+        }
+        return adminName;
+    }
+
+    @Override
+    public boolean broadcastManagerMessage(String toClient, Action action) throws RemoteException {
+        System.out.print("Broadcasting message to everyone...");
+        IClientUpdate client;
+
+        switch (action){
+            case KICKOUT:
+                for( User u : server.users )
+                {
+                    client = u.getIClientUpdate();
+                    client.notifyManagerActions(toClient, remote.IClientUpdate.Action.KICKOUT);
                 }
+
+                System.out.print("...DONE\n");
+                System.out.println(toClient + " has been kicked out the room.");
+                break;
+
+            case ASSIGNADMIN:
+                for( User u : server.users )
+                {
+                    client = u.getIClientUpdate();
+                    client.notifyManagerActions(toClient, remote.IClientUpdate.Action.ASSIGNADMIN);
+                    client.setVisibility();
+                }
+
+                System.out.print("...DONE\n");
+                System.out.println(toClient + " is the new manager.");
+                break;
+        }
+
+        return true;
     }
 }