Reduced code nesting.

src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java

@@ -395,27 +395,26 @@ private ChatRoomListener(ChatRoomIrcImpl chatroom)
         @Override
         public void onTopicChange(TopicMessage msg)
         {
-            if (isThisChatRoom(msg.getChannelName()))
-            {
+            if (isThisChatRoom(msg.getChannelName()) == false)
+                return;
+            
             this.chatroom.updateSubject(msg.getTopic().getValue());
         }
-        }
 
         @Override
         public void onChannelMode(ChannelModeMessage msg)
         {
-            if (isThisChatRoom(msg.getChannelName()))
-            {
+            if (isThisChatRoom(msg.getChannelName()) == false)
+                return;
+            
             processModeMessage(msg);
         }
-        }
 
         @Override
         public void onChannelJoin(ChanJoinMessage msg)
         {
-            if (isThisChatRoom(msg.getChannelName()))
-            {
-                String user = msg.getSource().getNick();
+            if (isThisChatRoom(msg.getChannelName()) == false)
+                return;
             
             if (isMe(msg.getSource()))
             {
@@ -423,52 +422,49 @@ public void onChannelJoin(ChanJoinMessage msg)
             }
             else
             {
+                String user = msg.getSource().getNick();
                 ChatRoomMemberIrcImpl member =
                     new ChatRoomMemberIrcImpl(IrcStack.this.provider,
-                            this.chatroom, user,
-                            ChatRoomMemberRole.SILENT_MEMBER);
+                        this.chatroom, user, ChatRoomMemberRole.SILENT_MEMBER);
                 this.chatroom.fireMemberPresenceEvent(member, null,
                     ChatRoomMemberPresenceChangeEvent.MEMBER_JOINED, null);
             }
         }
-        }
 
         @Override
         public void onChannelPart(ChanPartMessage msg)
         {
-            if (isThisChatRoom(msg.getChannelName()))
-            {
-                String user = msg.getSource().getNick();
+            if (isThisChatRoom(msg.getChannelName()) == false)
+                return;
             
             if (isMe(msg.getSource()))
             {
                 IrcStack.this.provider.getMUC().fireLocalUserPresenceEvent(
                     this.chatroom,
-                        LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT,
-                        null);
+                    LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT, null);
                 IrcStack.this.joined.remove(this.chatroom.getIdentifier());
                 IrcStack.this.irc.deleteListener(this);
             }
             else
             {
-                    ChatRoomMember member =
-                        this.chatroom.getChatRoomMember(user);
+                String user = msg.getSource().getNick();
+                ChatRoomMember member = this.chatroom.getChatRoomMember(user);
                 this.chatroom.fireMemberPresenceEvent(member, null,
                     ChatRoomMemberPresenceChangeEvent.MEMBER_LEFT,
                     msg.getPartMsg());
             }
         }
-        }
         
         @Override
         public void onChannelKick(ChannelKick msg)
         {
+            if (isThisChatRoom(msg.getChannelName()) == false)
+                return;
+            
             //TODO DEBUG CODE!
             System.out.println("KICK: " + msg.getText() + " "
                 + msg.getChannelName() + " " + msg.getKickedUser());
 
-            if (isThisChatRoom(msg.getChannelName()))
-            {
             String kickedUser = msg.getKickedUser();
             if (isMe(kickedUser))
             {
@@ -495,7 +491,6 @@ public void onChannelKick(ChannelKick msg)
                 }
             }
         }
-        }
 
         @Override
         public void onUserQuit(QuitMessage msg)
@@ -513,20 +508,18 @@ public void onUserQuit(QuitMessage msg)
         @Override
         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",
-                        null);
+                new MessageIrcImpl(msg.getText(), "text/plain", "UTF-8", null);
             ChatRoomMemberIrcImpl member =
                 new ChatRoomMemberIrcImpl(IrcStack.this.provider,
                     this.chatroom, msg.getSource().getNick(),
                     ChatRoomMemberRole.MEMBER);
-                this.chatroom.fireMessageReceivedEvent(message, member,
-                    new Date(),
+            this.chatroom.fireMessageReceivedEvent(message, member, new Date(),
                 ChatRoomMessageReceivedEvent.CONVERSATION_MESSAGE_RECEIVED);
         }
-        }
 
         private void processModeMessage(ChannelModeMessage msg)
         {