sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Reduced code nesting.

Browse Source
fix-message-formatting
Danny van Heumen 12 years ago
parent 55b55a2f16
commit 5b21c014e4
1 changed files with 71 additions and 78 deletions
Show Stats Download Patch File Download Diff File

149
src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
Unescape View File

@ -395,104 +395,99 @@ private ChatRoomListener(ChatRoomIrcImpl chatroom)
@Override @Override
public void onTopicChange(TopicMessage msg) public void onTopicChange(TopicMessage msg)
{ {
if (isThisChatRoom(msg.getChannelName())) if (isThisChatRoom(msg.getChannelName()) == false)
{ return;
this.chatroom.updateSubject(msg.getTopic().getValue());
} this.chatroom.updateSubject(msg.getTopic().getValue());
} }
@Override @Override
public void onChannelMode(ChannelModeMessage msg) public void onChannelMode(ChannelModeMessage msg)
{ {
if (isThisChatRoom(msg.getChannelName())) if (isThisChatRoom(msg.getChannelName()) == false)
{ return;
processModeMessage(msg);
} processModeMessage(msg);
} }
@Override @Override
public void onChannelJoin(ChanJoinMessage msg) public void onChannelJoin(ChanJoinMessage msg)
{ {
if (isThisChatRoom(msg.getChannelName())) if (isThisChatRoom(msg.getChannelName()) == false)
return;
if (isMe(msg.getSource()))
{
// I think that this should not happen.
}
else
{ {
String user = msg.getSource().getNick(); String user = msg.getSource().getNick();
ChatRoomMemberIrcImpl member =
if (isMe(msg.getSource())) new ChatRoomMemberIrcImpl(IrcStack.this.provider,
{ this.chatroom, user, ChatRoomMemberRole.SILENT_MEMBER);
// I think that this should not happen. this.chatroom.fireMemberPresenceEvent(member, null,
} ChatRoomMemberPresenceChangeEvent.MEMBER_JOINED, null);
else
{
ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(IrcStack.this.provider,
this.chatroom, user,
ChatRoomMemberRole.SILENT_MEMBER);
this.chatroom.fireMemberPresenceEvent(member, null,
ChatRoomMemberPresenceChangeEvent.MEMBER_JOINED, null);
}
} }
} }
@Override @Override
public void onChannelPart(ChanPartMessage msg) public void onChannelPart(ChanPartMessage msg)
{ {
if (isThisChatRoom(msg.getChannelName())) if (isThisChatRoom(msg.getChannelName()) == false)
return;
if (isMe(msg.getSource()))
{
IrcStack.this.provider.getMUC().fireLocalUserPresenceEvent(
this.chatroom,
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT, null);
IrcStack.this.joined.remove(this.chatroom.getIdentifier());
IrcStack.this.irc.deleteListener(this);
}
else
{ {
String user = msg.getSource().getNick(); String user = msg.getSource().getNick();
ChatRoomMember member = this.chatroom.getChatRoomMember(user);
if (isMe(msg.getSource())) this.chatroom.fireMemberPresenceEvent(member, null,
{ ChatRoomMemberPresenceChangeEvent.MEMBER_LEFT,
IrcStack.this.provider.getMUC().fireLocalUserPresenceEvent( msg.getPartMsg());
this.chatroom,
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT,
null);
IrcStack.this.joined.remove(this.chatroom.getIdentifier());
IrcStack.this.irc.deleteListener(this);
}
else
{
ChatRoomMember member =
this.chatroom.getChatRoomMember(user);
this.chatroom.fireMemberPresenceEvent(member, null,
ChatRoomMemberPresenceChangeEvent.MEMBER_LEFT,
msg.getPartMsg());
}
} }
} }
@Override @Override
public void onChannelKick(ChannelKick msg) public void onChannelKick(ChannelKick msg)
{ {
if (isThisChatRoom(msg.getChannelName()) == false)
return;
//TODO DEBUG CODE! //TODO DEBUG CODE!
System.out.println("KICK: " + msg.getText() + " " System.out.println("KICK: " + msg.getText() + " "
+ msg.getChannelName() + " " + msg.getKickedUser()); + msg.getChannelName() + " " + msg.getKickedUser());
if (isThisChatRoom(msg.getChannelName())) String kickedUser = msg.getKickedUser();
if (isMe(kickedUser))
{ {
String kickedUser = msg.getKickedUser(); IrcStack.this.provider.getMUC().fireLocalUserPresenceEvent(
if (isMe(kickedUser)) this.chatroom,
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_KICKED,
msg.getText());
IrcStack.this.joined.remove(this.chatroom.getIdentifier());
IrcStack.this.irc.deleteListener(this);
}
else
{
ChatRoomMember kickedMember =
this.chatroom.getChatRoomMember(kickedUser);
String user = msg.getSource().getNick();
if (kickedMember != null)
{ {
IrcStack.this.provider.getMUC().fireLocalUserPresenceEvent( ChatRoomMember kicker =
this.chatroom, this.chatroom.getChatRoomMember(user);
LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_KICKED, this.chatroom.fireMemberPresenceEvent(kickedMember,
kicker,
ChatRoomMemberPresenceChangeEvent.MEMBER_KICKED,
msg.getText()); msg.getText());
IrcStack.this.joined.remove(this.chatroom.getIdentifier());
IrcStack.this.irc.deleteListener(this);
}
else
{
ChatRoomMember kickedMember =
this.chatroom.getChatRoomMember(kickedUser);
String user = msg.getSource().getNick();
if (kickedMember != null)
{
ChatRoomMember kicker =
this.chatroom.getChatRoomMember(user);
this.chatroom.fireMemberPresenceEvent(kickedMember,
kicker,
ChatRoomMemberPresenceChangeEvent.MEMBER_KICKED,
msg.getText());
}
} }
} }
} }
@ -513,19 +508,17 @@ public void onUserQuit(QuitMessage msg)
@Override @Override
public void onChannelMessage(ChannelPrivMsg msg) public void onChannelMessage(ChannelPrivMsg msg)
{ {
if (isThisChatRoom(msg.getChannelName())) if (isThisChatRoom(msg.getChannelName()) == false)
{ return;
MessageIrcImpl message =
new MessageIrcImpl(msg.getText(), "text/plain", "UTF-8", MessageIrcImpl message =
null); new MessageIrcImpl(msg.getText(), "text/plain", "UTF-8", null);
ChatRoomMemberIrcImpl member = ChatRoomMemberIrcImpl member =
new ChatRoomMemberIrcImpl(IrcStack.this.provider, new ChatRoomMemberIrcImpl(IrcStack.this.provider,
this.chatroom, msg.getSource().getNick(), this.chatroom, msg.getSource().getNick(),
ChatRoomMemberRole.MEMBER); ChatRoomMemberRole.MEMBER);
this.chatroom.fireMessageReceivedEvent(message, member, this.chatroom.fireMessageReceivedEvent(message, member, new Date(),
new Date(), ChatRoomMessageReceivedEvent.CONVERSATION_MESSAGE_RECEIVED);
ChatRoomMessageReceivedEvent.CONVERSATION_MESSAGE_RECEIVED);
}
} }
private void processModeMessage(ChannelModeMessage msg) private void processModeMessage(ChannelModeMessage msg)

Write Preview
Loading…
Cancel
Save