|
@@ -47,31 +47,34 @@ class ReceiveThread extends Thread {
|
47
|
47
|
|
48
|
48
|
if(!(notif.getAuthor().equals(user)) && !notif.isRedirected())
|
49
|
49
|
{
|
|
50
|
+ notif.setRedirected(true);
|
|
51
|
+
|
50
|
52
|
for(Socket s:outdoor_dest_sockets)
|
51
|
|
- {
|
52
|
|
- try
|
|
53
|
+ {
|
|
54
|
+ try
|
53
|
55
|
{
|
54
|
56
|
ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
|
55
|
|
- notif.setRedirected(true);
|
56
|
57
|
out.writeObject(notif);
|
57
|
|
- notif.setRedirected(false);
|
|
58
|
+
|
58
|
59
|
}
|
59
|
60
|
catch(IOException e){}
|
60
|
61
|
}
|
|
62
|
+ notif.setRedirected(false);
|
61
|
63
|
}
|
62
|
64
|
|
63
|
65
|
if(isOutdoor)
|
64
|
66
|
{
|
|
67
|
+ notif.setRedirected(true);
|
65
|
68
|
for(Socket s:dest_sockets)
|
66
|
69
|
{
|
67
|
70
|
try
|
68
|
71
|
{
|
69
|
72
|
ObjectOutputStream out = new ObjectOutputStream(s.getOutputStream());
|
70
|
|
- notif.setRedirected(true);
|
71
|
73
|
out.writeObject(notif);
|
72
|
74
|
}
|
73
|
75
|
catch(IOException e){}
|
74
|
76
|
}
|
|
77
|
+ notif.setRedirected(false);
|
75
|
78
|
}
|
76
|
79
|
else
|
77
|
80
|
{
|
|
@@ -132,7 +135,7 @@ class ReceiveThread extends Thread {
|
132
|
135
|
knownUsersPanel.append("\nOutdoor users:\n");
|
133
|
136
|
for(User a:known_outdoor_users)
|
134
|
137
|
{
|
135
|
|
- knownUsersPanel.append(" " + a.getName() + " \n");
|
|
138
|
+ knownUsersPanel.append("(" + a.getName() + ") \n");
|
136
|
139
|
}
|
137
|
140
|
displayArea.setCaretPosition(displayArea.getDocument().getLength());
|
138
|
141
|
}
|