Merge branch 'mpriymak' of...

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

 Conflicts:
	src/client/Client.java

src/GUI/StartScreen.java

@@ -27,28 +27,26 @@ public class StartScreen {
 //    }
 
 
-    ActionListener actionListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
+    ActionListener actionListener = new ActionListener()
+    {
+        public void actionPerformed(ActionEvent e)
+        {
             if (e.getSource() == joinButton)
             {
-                client.setUsername(textField1.getText());
                 client.setServerAddress(textField2.getText());
+                client.setUsername(textField1.getText());
 
                 if( client.connect() )
                 {
                     frame.setVisible(false);
                     frame.dispose();
+                    client.run();
                 }
                 else
                 {
                     showErrorMessage("Could not connect to server...");
                 }
 
-
-
-
-                client.
-
                 //new ChatScreen();
             }
         }

src/client/Client.java

@@ -3,7 +3,6 @@ package client;
 import remote.IChatController;
 import remote.IClientController;
 import client.ChatUpdate;
-import client.DrawingUpdate;
 import GUI.StartScreen;
 
 import java.rmi.NotBoundException;
@@ -14,6 +13,7 @@ import java.util.concurrent.TimeUnit;
 
 public class Client
 {
+    //test
     private String userName;
     private String serverAddress;
 
@@ -39,6 +39,7 @@ public class Client
     {
         this.userName = "DefaultUser";
         this.chatUpdate = new ChatUpdate();
+        this.startScreen = new StartScreen(this);
         this.drawingUpdate = new DrawingUpdate();
     }
 
@@ -55,12 +56,13 @@ public class Client
         }
     }
 
-    public void run() throws RemoteException, NotBoundException
+    public void run()
     {
-        connect();
+        //connect();
 
         try
         {
+            System.out.println("Sleeping...");
             TimeUnit.MINUTES.sleep(5);
         }
         catch(Exception e)
@@ -69,24 +71,31 @@ public class Client
         }
     }
 
-    public boolean connect() throws RemoteException, NotBoundException
+    public boolean connect()
     {
-        registryServer = LocateRegistry.getRegistry("localhost");
+        try
+        {
+            registryServer = LocateRegistry.getRegistry(serverAddress);
 
             chatController = (IChatController) registryServer.lookup("ChatController");
             clientController = (IClientController) registryServer.lookup("ClientController");
 
-        System.out.println(userName + " fetched all controller from RMI registry");
-
-        if ( clientController.join(userName, this.chatUpdate, this.drawingUpdate ) )
+            if (clientController.join(userName, this.chatUpdate))
             {
                 System.out.println("Connected to server");
 
                 return true;
             }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
 
         return false;
     }
 
 
+
+
 }
\ No newline at end of file