Attachment 74824 Details for Bug 198132 – "Null Join Message" Bug Patch

[patch] "Null Join Message" Bug Patch

ecf-irc-nulljoinmessage.diff (text/plain), 2.43 KB, created by Cagatay Calli

on 2007-07-27 14:55:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cagatay Calli

Created: 2007-07-27 14:55:41 EDT

Size: 2.43 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ecf.ui
>Index: src/org/eclipse/ecf/internal/ui/deprecated/views/ChatRoomManagerView.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.ui/src/org/eclipse/ecf/internal/ui/deprecated/views/ChatRoomManagerView.java,v
>retrieving revision 1.4
>diff -u -r1.4 ChatRoomManagerView.java
>--- src/org/eclipse/ecf/internal/ui/deprecated/views/ChatRoomManagerView.java	26 Jun 2007 20:10:43 -0000	1.4
>+++ src/org/eclipse/ecf/internal/ui/deprecated/views/ChatRoomManagerView.java	27 Jul 2007 18:54:18 -0000
>@@ -985,7 +985,15 @@
> 				cleanUp();
> 			} else if (command.equalsIgnoreCase("PART")) {
> 				disconnect();
>-			} else {
>+			} else if (command.equalsIgnoreCase("JOIN")) {
>+				String arg1 = args[0];
>+				String arg2 = "";
>+				if (args.length > 1) {
>+					arg2 = args[1];
>+				}
>+				doJoinRoom(arg1, arg2);
>+			} 
>+			else {
> 				sendMessageLine(line);
> 			}
> 		}
>#P org.eclipse.ecf.presence.ui
>Index: src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.ecf/plugins/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java,v
>retrieving revision 1.18
>diff -u -r1.18 ChatRoomManagerView.java
>--- src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java	27 Jul 2007 15:11:20 -0000	1.18
>+++ src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerView.java	27 Jul 2007 18:54:21 -0000
>@@ -1052,8 +1052,12 @@
> 						Messages.ChatRoomManagerView_NOT_CONNECTED_TITLE,
> 						Messages.ChatRoomManagerView_NOT_CONNECTED_MESSAGE);
> 				return;
>-			} else
>-				sendMessageLine(processForCommand(chatRoomContainer, text));
>+			} else {
>+				String output = processForCommand(chatRoomContainer, text);
>+				if(output != null){
>+					sendMessageLine(processForCommand(chatRoomContainer, text));
>+				}
>+			}
> 		}
> 
> 		protected void chatRoomDisconnect() {
>@@ -1171,8 +1175,12 @@
> 					Messages.ChatRoomManagerView_NOT_CONNECTED_TITLE,
> 					Messages.ChatRoomManagerView_NOT_CONNECTED_MESSAGE);
> 			return;
>-		} else
>-			sendMessageLine(processForCommand(null, text));
>+		} else {
>+			String output = processForCommand(null, text);
>+			if(output != null){
>+				sendMessageLine(processForCommand(null, text));
>+			}
>+		}
> 	}
> 
> 	protected String processForCommand(IChatRoomContainer chatRoomContainer,

Actions: View | Diff

Attachments on bug 198132: 74824