PRIVMSG

3 files changed, 13 insertions, 10 deletions

diff --git a/src/Client/ChatClient.java b/src/Client/ChatClient.java
index d7b5099..01863bc 100644
--- a/src/Client/ChatClient.java
+++ b/src/Client/ChatClient.java
@@ -6,7 +6,11 @@ import java.net.Socket;
 
 
 
+
+
+
 import Server.ChatServer;
+import Server.Client;
 
 public class ChatClient
 {
@@ -41,6 +45,11 @@ public class ChatClient
 		writer.sendLine(line);
 	}
 	
+	public void PRIVMSG (String line)
+	{ 
+		runSendline(line);
+	}
+	
 	public boolean connect (String host, int port)
 	{
 		Socket soc;
@@ -83,12 +92,9 @@ public class ChatClient
 
 /** Tasks
 
- * TODO: 2. When the user presses "Connect", a message will be sent to a channel:
+ * TODO: 2. When the user presses "send", a message will be sent to a channel:
  * use PRIVMSG to channel #chat.
  * 
- * TODO: 3. After the user pressed "Connect", the button is displayed
- * as "disabled".
- *
  * TODO: 4. But we do want to allow sending commands to the channel. A
  * message line that begins with the word "/QUOTE", will be sent as is
  * (except the word "/QUOTE") to the server.
diff --git a/src/Client/ChatClientReader.java b/src/Client/ChatClientReader.java
index c71fb28..976bf84 100644
--- a/src/Client/ChatClientReader.java
+++ b/src/Client/ChatClientReader.java
@@ -45,11 +45,8 @@ public class ChatClientReader extends Thread
 				System.out.println("");
 				System.out.println(line);
 				
-				ui.outputWriter(line);
-				
-				
-				
-				
+				ui.outputWriter(line);		
+
 			} while (line != null);
 			
 
diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index 38ada43..0580e3b 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -102,7 +102,7 @@ public class UserInterface extends JFrame implements ActionListener
 		if (command == "send")
 		{
 			output.append(message.getText() + "\n");
-			client.runSendline(message.getText());
+			client.PRIVMSG(message.getText());
 			message.setText("");
 			
 		}