* Removing unused variables.

1 files changed, 18 insertions, 23 deletions

diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index 872db72..4dedc44 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -4,9 +4,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.net.Socket;
 
-import javax.swing.AbstractButton;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -15,7 +13,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
-import javax.xml.soap.Text;
 
 public class UserInterface extends JFrame implements ActionListener, KeyListener
 {	
@@ -23,7 +20,6 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 	private JTextField message;
 	private JTextArea output;
 	private ChatClient client;
-	private ChatClientReader read;
 	private JTextField host = new JTextField("localhost", 15);
 	private JTextField port = new JTextField("6667", 4);
 	private JButton connect;
@@ -51,8 +47,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 		JPanel conPanel = new JPanel();
 		JPanel vertPanel = new JPanel();
 		
-		JTextArea feedbackText = new JTextArea();
-	    JScrollPane scrollText = new JScrollPane(feedbackText);
+	    JScrollPane scrollText = new JScrollPane(output);
 		
 		message = new JTextField(40);
 		message.addKeyListener(this);
@@ -85,9 +80,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 		conPanel.add(new JLabel("port:"));
 		conPanel.add(port);
 		
-		conPanel.add(scrollText);
-		
-		vertPanel.add(output);
+		vertPanel.add(scrollText);
 		vertPanel.add(conPanel);
 		vertPanel.add(msgPanel);
 				
@@ -95,11 +88,9 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 		
 		setVisible(true);
 	}
-	
 
 	int counterClick = 0;
 	
-	
 	/** Syncing the the action that the button send to the perform
 	 * @param name of the action  */	
 	public void actionPerformed(ActionEvent e)
@@ -111,18 +102,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 		{	
 			client.shutdown();
 			System.exit(0);
-		}
-		
-//		if (e.getSource() == 'escape')
-//		{
-//			System.exit(0);
-//		}
-//		
-//		if (e.getSource() == 'ALT' + 'F4')
-//		{
-//			System.exit(0);
-//		}
-		
+		}	
 		
 		if (command == "send" )
 		{
@@ -157,6 +137,21 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
 			client.PRIVMSG(message.getText());
 			message.setText("");		
 		}
+		
+		if (e.getKeyChar() == KeyEvent.VK_ESCAPE)
+		{
+			client.shutdown();
+			System.exit(0);
+		}
+		
+		if ((e.getModifiers() & KeyEvent.ALT_DOWN_MASK) == 0 && e.getKeyChar() == KeyEvent.VK_C && counterClick == 0)
+		{
+			output.append("You've connect to the server succesufully" + "\n");
+			counterClick++;
+			this.send.setEnabled(true);
+			this.connect.setEnabled(false);
+		}
+	
 
 	}