summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDor Bivas <dor1_b@walla.com>2014-02-08 14:19:52 +0200
committerDor Bivas <dor1_b@walla.com>2014-02-08 14:19:52 +0200
commitddbc13d4c7c04c91c231d40069ced1fc030db327 (patch)
treee4f20ef32735c223436386e4aae553db70b4b17b
parent8ea9279a828de3df6c9289406827be46f93bc65b (diff)
Client ui: Fixing code duplication of action listener and key listener.
* adding "me: " to the client messages.
-rw-r--r--src/Client/UserInterface.java40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index 613ed2f..22a7b8e 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -33,6 +33,21 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
output.append(line + "\n");
}
+ private void msgSendRun ()
+ {
+ output.append("me: " + message.getText() + "\n");
+ client.PRIVMSG(message.getText());
+ message.setText("");
+ }
+
+ private void msgConnectRun ()
+ {
+ output.append("You've connect to the server succesufully" + "\n");
+ counterClick++;
+ this.send.setEnabled(true);
+ this.connect.setEnabled(false);
+ }
+
/** Graphic interface recipient the client*/
public UserInterface(ChatClient client)
{
@@ -97,11 +112,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
vertPanel.add(msgPanel);
add(vertPanel);
-
- int x = scrollText.getWidth();
- int y = send.getHeight();
- System.out.println(x + " " + y);
-
+
setVisible(true);
}
@@ -121,20 +132,14 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
if (command == "send" )
{
- output.append(message.getText() + "\n");
- client.PRIVMSG(message.getText());
- message.setText("");
-
+ msgSendRun();
}
if (command == "connect" && counterClick == 0 )
{
if (client.connect(host.getText(),Integer.parseInt(port.getText())))
{
- output.append("You've connect to the server succesufully" + "\n");
- counterClick++;
- this.send.setEnabled(true);
- this.connect.setEnabled(false);
+ msgConnectRun ();
}
}
@@ -148,9 +153,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
if (e.getKeyChar() == KeyEvent.VK_ENTER)
{
- output.append(message.getText() + "\n");
- client.PRIVMSG(message.getText());
- message.setText("");
+ msgSendRun();
}
if (e.getKeyChar() == KeyEvent.VK_ESCAPE)
@@ -161,10 +164,7 @@ public class UserInterface extends JFrame implements ActionListener, KeyListener
if ((e.getModifiers() & KeyEvent.ALT_DOWN_MASK) == 0 && e.getKeyChar() == KeyEvent.VK_C && counterClick == 0) //FIXME: ALT + SHIFT + C?...
{
- output.append("You've connect to the server succesufully" + "\n");
- counterClick++;
- this.send.setEnabled(true);
- this.connect.setEnabled(false);
+ msgConnectRun();
}