summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDor Bivas <dor1_b@walla.com>2013-12-04 13:56:21 +0200
committerDor Bivas <dor1_b@walla.com>2013-12-04 13:56:21 +0200
commit186b682c6a87ddec0a1534b30b7deaca0cccec0a (patch)
treea9b24f0a443ddba68abb73b2990a2a1ace6d1184
parent615683d70addedd4c661c8b324599f06dfe65aee (diff)
Connect ui to client and server
-rw-r--r--src/Client/ChatClient.java4
-rw-r--r--src/Client/UserInterface.java2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Client/ChatClient.java b/src/Client/ChatClient.java
index 60e33c4..ac6e6ac 100644
--- a/src/Client/ChatClient.java
+++ b/src/Client/ChatClient.java
@@ -52,7 +52,7 @@ public class ChatClient
reader.setDisplay(ui);
- ChatClientWriter writer = new ChatClientWriter(soc,this);
+ this.writer = new ChatClientWriter(soc,this);
reader.start();
writer.start();
@@ -72,7 +72,7 @@ public class ChatClient
client.setNick("dor");
client.setRealname("Dor bivas");
client.ui = new UserInterface(client);
-
+
//soc.close();
}
diff --git a/src/Client/UserInterface.java b/src/Client/UserInterface.java
index 2c646bb..5f69550 100644
--- a/src/Client/UserInterface.java
+++ b/src/Client/UserInterface.java
@@ -102,7 +102,9 @@ public class UserInterface extends JFrame implements ActionListener
if (command == "send")
{
output.append(message.getText() + "\n");
+ client.runSendline(message.getText());
message.setText("");
+
}
if (counterClick>0 && command == "connect")