farina/COO-farina-vincent
1
0
複製 0
程式碼 問題管理 合併請求 版本發佈 Wiki Activity

Unicité du nom d'utilisateur + WIP déconnexion

瀏覽代碼
This commit is contained in:
Metatheria 2021-01-05 17:13:39 +01:00
父節點 de1ffdb4a8
當前提交 6c0c3f8747
共有 3 個文件被更改，包括 89 次插入 和 41 次删除
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/chat/ClientWindow.java
查看文件

@ -58,6 +58,11 @@ public class ClientWindow implements ActionListener {
{
sendButton.addActionListener(this);
messageField.addActionListener(this);
chatWindow.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
network.send(null);
}
});
sendPanel.add(messageField);

26
src/chat/Message.java
查看文件

@ -1,15 +1,29 @@
package chat;
public class Message {
private String msg = null;
public void setmsg(String msg)
private String text;
private String author;
public Message(String in_text, String in_author)
{
this.msg = msg;
text = in_text;
author = in_author;
}
public String getmsg()
public void setText(String new_text)
{
return msg;
text = new_text;
}
public String getText()
{
return text;
}
public void setAuthor(String new_author)
{
author = new_author;
}
public String getAuthor()
{
return author;
}
}

99
src/chat/NetworkClient.java
查看文件

@ -12,39 +12,37 @@ import java.io.*;
import java.util.*;
import chat.User;
import chat.Message;
class SendThread extends Thread {
String username;
String address;
String message;
Message message;
int port;
SendThread(String in_username, String in_address, String in_message, int in_port)
SendThread(Message in_message, String in_address, int in_port)
{
username = in_username;
address = in_address;
message = in_message;
address = in_address;
port = in_port;
}
public void run()
{
Socket link;
boolean connected = false;
PrintWriter out;
ObjectOutputStream out;
while(!connected)
{
try
{
link = new Socket(address, port);
out = new PrintWriter(link.getOutputStream(),true);
out.println(username + " : " + message);
out = new ObjectOutputStream(link.getOutputStream());
out.writeObject(message);
connected = true;
}
catch(IOException e)
{
System.out.println("nik1!");
e.printStackTrace();
connected = false;
}
}
@ -56,10 +54,13 @@ class ReceiveThread extends Thread {
int port;
JTextArea displayArea;
ReceiveThread(int in_port, JTextArea in_displayArea)
List<User> known_users;
ReceiveThread(int in_port, JTextArea in_displayArea, List<User> in_known_users)
{
port = in_port;
displayArea = in_displayArea;
known_users = in_known_users;
}
public void run()
{
@ -70,12 +71,31 @@ class ReceiveThread extends Thread {
while(!exit)
{
Socket link = servSocket.accept();
BufferedReader in = new BufferedReader(new InputStreamReader(link.getInputStream()));
String message = in.readLine();
displayArea.append(message + "\n");
displayArea.setCaretPosition(displayArea.getDocument().getLength());
link.close();
try
{
Socket link = servSocket.accept();
ObjectInputStream in = new ObjectInputStream(link.getInputStream());
Message message = (Message) in.readObject();
if(message.getText() != null)
{
displayArea.append(message.getAuthor() + " : " + message.getText() + "\n");
}
else
{
displayArea.append(message.getAuthor() + " has left the chat.\n");
for(int i = 0;i < known_users.size();i ++)
{
if (known_users.get(i).getName().equals(message.getAuthor()))
known_users.remove(i);
}
}
displayArea.setCaretPosition(displayArea.getDocument().getLength());
link.close();
}
catch(Exception e)
{
}
}
}
@ -99,6 +119,7 @@ class ConnectionListenerThread extends Thread {
public void run()
{
boolean exit = false;
boolean accepted = true;
byte[] buffer = new byte[100];
DatagramPacket request = new DatagramPacket(buffer, buffer.length);
DatagramPacket responsePacket;
@ -139,11 +160,20 @@ class ConnectionListenerThread extends Thread {
response1 = bStream.toByteArray();
responsePacket = new DatagramPacket(response1, response1.length, clientAddress, 1337);
responseSocket.send(responsePacket);
if(known_users.indexOf(new User(username, clientAddress.getHostAddress())) == -1)
accepted = true;
for(User a:known_users)
{
accepted = accepted && (!username.equals(a.getName()));
}
if(accepted)
{
known_users.add(new User(username, clientAddress.getHostAddress()));
}
else
{
System.out.println("Username already taken");
}
}
catch(SocketTimeoutException e) {}
}
@ -183,6 +213,7 @@ public class NetworkClient {
boolean connect(String username)
{
boolean nameAvailable = true;
boolean connected = false;
DatagramSocket connectionSocket;
DatagramSocket userListSocket;
@ -223,26 +254,31 @@ public class NetworkClient {
userList = (ArrayList<User>) userListStream.readObject();
if (userList.indexOf(user) != -1)
connected = false;
else
for(User a:userList)
{
nameAvailable = nameAvailable && (!username.equals(a.getName()));
}
if(nameAvailable)
{
System.out.println(userList.size() + " users currently connected");
System.out.println(userList.size() + " users currently connected");
for(int i = 0;i < userList.size();i ++)
{
System.out.println(userList.get(i).getName() + " : " + userList.get(i).getAddress());
known_users.add(userList.get(i));
}
known_users.add(new User(username, "25.67.234.235"));
known_users.add(new User(username, "25.68.185.103"));
connected = true;
}
}
catch(SocketTimeoutException e)
{
known_users.add(new User(username, "25.67.234.235"));
known_users.add(new User(username, "25.68.185.103"));
System.out.println("Reply timed out");
connected = true;
}
connectionSocket.close();
userListSocket.close();
}
catch (SocketException e2)
{
@ -254,13 +290,9 @@ public class NetworkClient {
}
if(connected)
{
{
user.setName(username);
ReceiveThread t2 = new ReceiveThread(1237, chatText);
for(User a:known_users)
{
System.out.println(a.getName() + ":" + a.getAddress());
}
ReceiveThread t2 = new ReceiveThread(1237, chatText, known_users);
ConnectionListenerThread t3 = new ConnectionListenerThread(known_users);
t2.start();
@ -274,11 +306,8 @@ public class NetworkClient {
{
for(User recipient:known_users)
{
if(recipient != user)
{
SendThread t1 = new SendThread(user.getName(), recipient.getAddress(), message, 1237);
SendThread t1 = new SendThread(new Message(user.getName(), message), recipient.getAddress(), 1237);
t1.start();
}
}
}
}