Max changes

src/GUI/ChatScreen.form

@@ -8,7 +8,7 @@
     <properties>
       <maximumSize width="-1" height="-1"/>
       <minimumSize width="-1" height="-1"/>
-      <preferredSize width="1200" height="700"/>
+      <preferredSize width="1200" height="600"/>
     </properties>
     <border type="none"/>
     <children>
@@ -185,7 +185,7 @@
                   <text value="Send Message To:"/>
                 </properties>
               </component>
-              <component id="cc35d" class="javax.swing.JComboBox" binding="sentMessageToComboBox">
+              <component id="cc35d" class="javax.swing.JComboBox" binding="sendMessageToComboBox">
                 <constraints>
                   <grid row="2" 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

@@ -15,7 +15,7 @@ public class ChatScreen {
     private JButton sendButton;
     private JPanel drawingPanel;
     private JPanel othersPanel;
-    private JComboBox sentMessageToComboBox;
+    private JComboBox sendMessageToComboBox;
     private JTextArea chatDisplayBox;
     private JComboBox userSelectComboBox;
     private JButton kickOutButton;
@@ -33,30 +33,38 @@ public class ChatScreen {
     private JButton quitButton;
     private JFrame frame;
 
-    public Client getClient() {
-        return client;
-    }
-
-    public Client client;
+    private Client client;
 
 
     public ChatScreen(Client client)
     {
         this.client = client;
-        exitThisRoomButton.addActionListener(actionListener);
-        sendButton.addActionListener(actionListener);
         yourNameDisplay.setText(client.getUserName());
-        drawingPanel = new PaintGUI(client);
-    }
+//        sentMessageToComboBox.addItem(client.getUserName());
+        quitButton.addActionListener(actionListener);
+        sendButton.addActionListener(actionListener);
+        frame = new JFrame("Application");
+        frame.setContentPane(panel2);
+        createUIComponents();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.pack();
+        frame.setResizable(false);
+        frame.setVisible(true);
 
+        SwingUtilities.getRootPane(sendButton).setDefaultButton(sendButton);
+    }
 
+    private void createUIComponents() {
+        drawingPanel = new PaintGUI(client).getGlobal();
+    }
 
     public JTextArea getChatDisplayBox() {
         return chatDisplayBox;
     }
 
-    public JComboBox getSentMessageToComboBox() {
-        return sentMessageToComboBox;
+    public JComboBox getSendMessageToComboBox()
+    {
+        return sendMessageToComboBox;
     }
 
     public JPanel getDrawingPanel() {
@@ -75,8 +83,18 @@ public class ChatScreen {
                 try
                 {
                     System.out.println("Send button pressed");
+
+                    String toUser = sendMessageToComboBox.getSelectedItem().toString();
+
+                    if( toUser.equals("All") )
+                    {
                         chatController.broadcastMessage(client.getUserName(), message);
                     }
+                    else
+                    {
+                        chatController.sendPrivateMessage(client.getUserName(), toUser, message);
+                    }
+                }
                 catch (RemoteException ex)
                 {
                     ex.printStackTrace();
@@ -99,20 +117,4 @@ public class ChatScreen {
         }
 
     };
-
-    public void showGUI() {
-        frame = new JFrame("Application");
-        JFrame.setDefaultLookAndFeelDecorated(true);
-        frame.setContentPane(panel2);
-        createUIComponents();
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        frame.pack();
-        frame.setResizable(false);
-        frame.setVisible(true);
-    }
-
-    private void createUIComponents() {
-//        PaintGUI paintGUI = new PaintGUI(client);
-        drawingPanel = new PaintGUI(client).getGlobal();
-    }
 }