Attachment #74788 for bug #197329




 *
 * Contributors:
 *    Composent, Inc. - initial API and implementation
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
 *****************************************************************************/

package org.eclipse.ecf.internal.presence.ui;


	public static String ChatRoomManagerView_COPY_TOOLTIP;

	public static String ChatRoomManagerView_DATE_FORMAT;

	public static String ChatRoomManagerView_DEFAULT_HOST;

	public static String ChatRoomManagerView_DEFAULT_USER;

	public static String ChatRoomManagerView_JOIN_COMMAND;
	
	public static String ChatRoomManagerView_MESSAGE;
	
	public static String ChatRoomManagerView_MESSAGE_DATE;

	public static String ChatRoomManagerView_NOT_CONNECTED_MESSAGE;



	public static String ChatRoomManagerView_SELECT_ALL_TOOLTIP;

	public static String ChatRoomManagerView_TIME_FORMAT;

	public static String ChatRoomManagerView_VIEW_DISABLED_NAME;

	public static String ChatRoomManagerView_VIEW_TITLE;

	
	public static String ToggleOnlineOnlyAction_title;

	public static String MessageRenderer_DEFAULT_DATE_FORMAT;
	public static String MessageRenderer_DEFAULT_DATETIME_FORMAT;
	public static String MessageRenderer_DEFAULT_TIME_FORMAT;
	
	static {
		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
	}




#
# Contributors:
#    Composent, Inc. - initial API and implementation
#    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
################################################################################

##########################

MultiRosterView_DISCONNECT_ACCOUNT_QUESTION_MESSAGE=Disconnect account {0}?
MultiRosterView_ROSTER_VIEW_EXT_POINT_ERROR_MESSAGE=Error in loading rosterViewerDropTargetExtension
MultiRosterView_EXCEPTION_JOIN_ROOM_INVALID_ACCOUNT=Invalid account
ChatRoomManagerView_TIME_FORMAT=HH:mm:ss
ChatRoomManagerView_DATE_FORMAT=yyyy-MM-dd
ChatRoomSelectionDialog_MESSAGE=Select a Chat Room to Enter
ChatRoomManagerView_DEFAULT_USER=<user>
ChatRoomManagerView_DEFAULT_HOST=<host>

ChatRoomManagerView_NOT_CONNECTED_TITLE=Not Connected
ChatRoomManagerView_NOT_CONNECTED_MESSAGE=Not connected to chat room
ChatRoomManagerView_PART_COMMAND=PART
ChatRoomManagerView_ENTERED_MESSAGE={0} entered
ChatRoomView_NOT_CONNECTED_MESSAGE=Not connected to chat room
ChatRoomManagerView_LEFT_MESSAGE={0} left
ChangePasswordDialog_CHANGE_PASSWORD=Change Password
ChatRoomManagerView_MESSAGE={0}: {1}\n
ChatRoomView_TIME_FORMAT=HH:mm:ss
ChatRoomView_DATE_FORMAT=yyyy-MM-dd 
ChatRoomManagerView_MESSAGE_DATE=({0}) 
ChatRoomView_NOT_CONNECTED_TITLE=Not connect
ChatRoomManagerView_CLEAR_CONFIRM_TITLE=Confirm Clear Output
ChangePasswordDialog_NEW_PASSWORD_LABEL=New Password:

BrowseDialog_title=Open Contact
BrowseDialog_message=Select a contact to message (*, ?, or camel case):
BrowseDialog_scanning=Scanning contacts...
ToggleOnlineOnlyAction_title=Show Online Only

MessageRenderer_DEFAULT_TIME_FORMAT=HH:mm:ss
MessageRenderer_DEFAULT_DATE_FORMAT=yyyy-MM-dd
MessageRenderer_DEFAULT_DATETIME_FORMAT=({0}) 




 *
 * Contributors:
 *    Composent, Inc. - initial API and implementation
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 192762, 197329
 ******************************************************************************/
package org.eclipse.ecf.presence.ui.chatroom;


import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Point;

	private static final int RATIO_READ_WRITE_PANE = 85;

	private static final int RATIO_PRESENCE_PANE = 15;
	
	protected static final String DEFAULT_ME_COLOR = "0,255,0"; //$NON-NLS-1$

	protected static final String DEFAULT_OTHER_COLOR = "0,0,0"; //$NON-NLS-1$

	protected static final String DEFAULT_SYSTEM_COLOR = "0,0,255"; //$NON-NLS-1$

	/**
	 * The default color used to highlight the string of text when the user's
	 * name is referred to in the chatroom. The default color is red.
	 */
	protected static final String DEFAULT_HIGHLIGHT_COLOR = "255,0,0"; //$NON-NLS-1$

	protected static final String DEFAULT_DATE_COLOR = "0,0,0"; //$NON-NLS-1$

	protected static final String DEFAULT_TIME_FORMAT = Messages.ChatRoomManagerView_TIME_FORMAT;

	protected static final String DEFAULT_DATE_FORMAT = Messages.ChatRoomManagerView_DATE_FORMAT;

	protected static final int DEFAULT_INPUT_HEIGHT = 25;

	protected static final int DEFAULT_INPUT_SEPARATOR = 5;

	private IChatRoomViewCloseListener rootCloseListener = null;

	private IChatRoomMessageSender rootMessageSender = null;
	
	/**
	 * UI independent renderer, that is aware of displaying any special fragments
	 * of message, like formatting, graphical attachments, emotional content, etc.
	 */
	private IMessageRenderer messageRenderer = null;

	private Color highlightColor = null;

	Action outputClear = null;


	}

	public void createPartControl(Composite parent) {
		otherColor = colorFromRGBString(DEFAULT_OTHER_COLOR);
		systemColor = colorFromRGBString(DEFAULT_SYSTEM_COLOR);
		highlightColor = colorFromRGBString(DEFAULT_HIGHLIGHT_COLOR);
		dateColor = colorFromRGBString(DEFAULT_DATE_COLOR);
		Composite rootComposite = new Composite(parent, SWT.NONE);
		rootComposite.setLayout(new FillLayout());
		boolean useTraditionalTabFolder = PlatformUI

				if (id != null) {
					appendText(getOutputText(), new ChatLine(NLS.bind(
							Messages.ChatRoomManagerView_ENTERED_MESSAGE,
							getUsernameFromID(id)), null));
					chatRoomParticipantViewer.add(p);
				}
			}

				if (id != null) {
					appendText(getOutputText(), new ChatLine(NLS.bind(
							Messages.ChatRoomManagerView_LEFT_MESSAGE,
							getUsernameFromID(id)), null));
					chatRoomParticipantViewer.remove(p);
				}
			}

		}
	}

	protected String getCurrentDate(String format) {
		SimpleDateFormat sdf = new SimpleDateFormat(format);
		String res = sdf.format(new Date());
		return res;
	}

	protected String getDateTime() {
		StringBuffer buf = new StringBuffer();
		buf.append(getCurrentDate(DEFAULT_DATE_FORMAT)).append(" ").append( //$NON-NLS-1$
				getCurrentDate(DEFAULT_TIME_FORMAT));
		return buf.toString();
	}

	public void disconnect() {
		if (rootCloseListener != null) {
			rootCloseListener.chatRoomViewClosing();

	private boolean shouldScrollToEnd(StyledText chatText) {
		Point locAtEnd = chatText.getLocationAtOffset(chatText.getText().length());
		Rectangle bounds = chatText.getBounds();
		return (locAtEnd.y > bounds.height + 5);
		return true;
	}

	protected void appendText(StyledText st, ChatLine text) {

			return;
		}
		
		String originator = null;
		
		int startRange = st.getText().length();
		StringBuffer sb = new StringBuffer();
		// check to see if the message has the user's name contained within
		boolean nickContained = text.getText().indexOf(localUserName) != -1;
		if (text.getOriginator() != null) {
			originator = text.getOriginator().getNickname(); 
		}
		
		String output = messageRenderer.render(text.getText(), originator, localUserName);
		StyleRange[] ranges = messageRenderer.getStyleRanges();
		
		if (output == null) {
			return;
			StyleRange dateStyle = new StyleRange();
			dateStyle.start = startRange;
			dateStyle.length = sb.length();
			dateStyle.foreground = dateColor;
			dateStyle.fontStyle = SWT.NORMAL;
			st.append(sb.toString());
			st.setStyleRange(dateStyle);
			sb = new StringBuffer();
			sb.append(text.getOriginator().getName()).append(": "); //$NON-NLS-1$
			StyleRange sr = new StyleRange();
			sr.start = startRange + dateStyle.length;
			sr.length = sb.length();
			sr.fontStyle = SWT.BOLD;
			// check to see which color should be used
			sr.foreground = nickContained ? highlightColor : otherColor;
			st.append(sb.toString());
			st.setStyleRange(sr);
		}
		int beforeMessageIndex = st.getText().length();
		st.append(text.getText());
		if (text.getOriginator() == null) {
			StyleRange sr = new StyleRange();
			sr.start = beforeMessageIndex;
			sr.length = text.getText().length();
			sr.foreground = systemColor;
			sr.fontStyle = SWT.BOLD;
			st.setStyleRange(sr);
		} else if (nickContained) {
			// highlight the message itself as necessary
			StyleRange sr = new StyleRange();
			sr.start = beforeMessageIndex;
			sr.length = text.getText().length();
			sr.foreground = highlightColor;
			st.setStyleRange(sr);
		}
		
		int startRange = st.getText().length();
			
		if (!text.isNoCRLF()) {
			output += "\n"; //$NON-NLS-1$
		}
		
		st.append(output);
		if (ranges != null) {

			// set all ranges to start as message line starts
			for (int i = 0; i < ranges.length; i++) {
				ranges[i].start += startRange;
				st.setStyleRange(ranges[i]);
			} 	
		}
		
		if (shouldScrollToEnd(st)) st.setSelection(startRange + output.length());
		// Bold title if view is not visible.
		IWorkbenchSiteProgressService pservice = (IWorkbenchSiteProgressService) this
				.getSite().getAdapter(IWorkbenchSiteProgressService.class);

		getSite().registerContextMenu(menuMgr, selectionProvider);
	}

	public void setMessageRenderer(IMessageRenderer defaultMessageRenderer) {
		this.messageRenderer = defaultMessageRenderer;
		if (rgb == null || rgb.equals("")) { //$NON-NLS-1$
			color = new Color(getViewSite().getShell().getDisplay(), 0, 0, 0);
			return color;
		}
		if (color != null) {
			color.dispose();
		}
		String[] vals = rgb.split(","); //$NON-NLS-1$
		color = new Color(getViewSite().getShell().getDisplay(), Integer
				.parseInt(vals[0]), Integer.parseInt(vals[1]), Integer
				.parseInt(vals[2]));
		return color;
	}
}

Lines 1-5 Link Here

(-)src/org/eclipse/ecf/presence/ui/chatroom/ChatRoomManagerUI.java (-1 / +7 lines)
1	/****************************************************************************	1	/****************************************************************************
2	* Copyright (c) 2004 Composent, Inc. and others.	2	* Copyright (c) 2004, 2007 Composent, Inc. and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Composent, Inc. - initial API and implementation	9	* Composent, Inc. - initial API and implementation
		10	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
10	*****************************************************************************/	11	*****************************************************************************/
11	package org.eclipse.ecf.presence.ui.chatroom;	12	package org.eclipse.ecf.presence.ui.chatroom;
12		13
Lines 106-111 Link Here
106	chatroomview.initializeWithManager(ChatRoomManagerView.getUsernameFromID(targetID),	107	chatroomview.initializeWithManager(ChatRoomManagerView.getUsernameFromID(targetID),
107	ChatRoomManagerView.getHostnameFromID(targetID),	108	ChatRoomManagerView.getHostnameFromID(targetID),
108	managerChatRoom, this, createChatRoomViewCloseListener());	109	managerChatRoom, this, createChatRoomViewCloseListener());
		110	chatroomview.setMessageRenderer(getDefaultMessageRenderer());
109	// Add listener for container, so that if the container is spontaneously	111	// Add listener for container, so that if the container is spontaneously
110	// disconnected,	112	// disconnected,
111	// then we will be able to have the UI respond by making itself inactive	113	// then we will be able to have the UI respond by making itself inactive
Lines 150-155 Link Here
150	});	152	});
151	}	153	}
152		154
		155	protected IMessageRenderer getDefaultMessageRenderer() {
		156	return new MessageRenderer();
		157	}
		158
153	protected String getPasswordForChatRoomConnect(IChatRoomInfo info) {	159	protected String getPasswordForChatRoomConnect(IChatRoomInfo info) {
154	return null;	160	return null;
155	}	161	}




/****************************************************************************
 * Copyright (c) 2007 Composent, Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
 *****************************************************************************/
package org.eclipse.ecf.presence.ui.chatroom;

import org.eclipse.ecf.internal.presence.ui.ChatLine;
import org.eclipse.swt.custom.StyleRange;

/**
 * Renders chat line, by arranging text content to be finally printed to 
 * Chat room output together with it's formatting.
 *
 */
public interface IMessageRenderer {

	/**
	 * Returns text content to be finally printed to chat room output.
	 * @param message chat message to be processed
	 * @param originator name of message sender
	 * @param localUserName local user name 
	 * @return text to be printed to output, nothing will be printed if null
	 */
	String render(String message, String originator, String localUserName);
	
	/**
	 * Returns formatting to be applied to rendered final output, returned by {@link #render(ChatLine, boolean)}.
	 * @return formatting to be applied to output, or null if no formatting
	 */
	StyleRange[] getStyleRanges();
	
}




/****************************************************************************
 * Copyright (c) 2007 Composent, Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
 *****************************************************************************/
package org.eclipse.ecf.presence.ui.chatroom;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.eclipse.core.runtime.Assert;
import org.eclipse.ecf.internal.presence.ui.Messages;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;

/**
 * Default implementation of {@link IMessageRenderer}.
 *
 */
public class MessageRenderer implements IMessageRenderer {

	private Color otherColor = null;
	private Color systemColor = null;
	private Color dateColor = null;
	private Color highlightColor = null;
	
	private StringBuffer buffer;
	
	private List styleRanges = new ArrayList();
	
	protected static final String DEFAULT_ME_COLOR = "0,255,0"; //$NON-NLS-1$
	protected static final String DEFAULT_OTHER_COLOR = "0,0,0"; //$NON-NLS-1$
	protected static final String DEFAULT_SYSTEM_COLOR = "0,0,255"; //$NON-NLS-1$

	/**
	 * The default color used to highlight the string of text when the user's
	 * name is referred to in the chatroom. The default color is red.
	 */
	protected static final String DEFAULT_HIGHLIGHT_COLOR = "255,0,0"; //$NON-NLS-1$
	protected static final String DEFAULT_DATE_COLOR = "0,0,0"; //$NON-NLS-1$
	
	protected static final String DEFAULT_TIME_FORMAT = Messages.MessageRenderer_DEFAULT_TIME_FORMAT;

	protected static final String DEFAULT_DATE_FORMAT = Messages.MessageRenderer_DEFAULT_DATE_FORMAT;
	
	protected boolean nickContained;
	protected String message;
	protected String originator;
	
	public MessageRenderer() {
		otherColor = colorFromRGBString(DEFAULT_OTHER_COLOR);
		systemColor = colorFromRGBString(DEFAULT_SYSTEM_COLOR);
		highlightColor = colorFromRGBString(DEFAULT_HIGHLIGHT_COLOR);
		dateColor = colorFromRGBString(DEFAULT_DATE_COLOR);
	}
	
	public StyleRange[] getStyleRanges() {
		return (StyleRange[]) styleRanges.toArray(new StyleRange[styleRanges.size()]);
	}
	
	public String render(String message, String originator, String localUserName) {
		Assert.isNotNull(localUserName);
		
		styleRanges.clear();
		
		if (message == null) {
			return null;
		}
		
		buffer = new StringBuffer();
		
		
		this.message = message;
		this.originator = originator;
		
		// check to see if the message has the user's name contained within
		// and make sure that the person referring to the user's name
		// is not the user himself, no highlighting is required in this case
		// as the user is already aware that his name is being referenced
		nickContained = (message.indexOf(localUserName) != -1) && (! localUserName.equals(originator));
		
		doRender();
		
		return buffer.toString();
	}
	
	protected void doRender() {
		
		appendDateTime();
		if (originator != null) {
			appendNickname();
		}
		appendMessage();
	}
	
	protected void appendDateTime() {
		String message = NLS.bind(Messages.MessageRenderer_DEFAULT_DATETIME_FORMAT, getCurrentDate(DEFAULT_TIME_FORMAT));
		append(message, dateColor, null, SWT.NORMAL);
	}

	protected void appendNickname() {
		String message = originator + ": "; //$NON-NLS-1$
		// check to see which color should be used
		Color foreground = nickContained ? highlightColor : otherColor;
		append(message, foreground, null, SWT.BOLD);
	}
	
	protected void appendMessage() {
		Color color = null;
		int style = SWT.NONE;
		if (originator == null) {
			color = systemColor;
			style = SWT.BOLD;
		} else if (nickContained) {
			// highlight the message itself as necessary			
			color = highlightColor;
		}
		append(message, color, null, style);
	}
	
	protected void append(String message, Color foreground, Color background, int style) {
		if (message == null) {
			return;
		}
		
		int start = buffer.length();
		
		buffer.append(message);
		
		if (foreground == null && background == null && style == SWT.NONE) {
			return;
		}
		
		StyleRange styleRange = new StyleRange(start, message.length(), foreground, background, style);
		styleRanges.add(styleRange);
	}
	
	private Color colorFromRGBString(String rgb) {
		Color color = null;
		if (rgb == null || rgb.equals("")) { //$NON-NLS-1$
			color = new Color(Display.getCurrent(), 0, 0, 0);
			return color;
		}
		if (color != null) {
			color.dispose();
		}
		String[] vals = rgb.split(","); //$NON-NLS-1$
		color = new Color(Display.getCurrent(), Integer
				.parseInt(vals[0]), Integer.parseInt(vals[1]), Integer
				.parseInt(vals[2]));
		return color;
	}
	
	protected String getCurrentDate(String format) {
		SimpleDateFormat sdf = new SimpleDateFormat(format);
		String res = sdf.format(new Date());
		return res;
	}

	protected String getDateTime() {
		StringBuffer buf = new StringBuffer();
		buf.append(getCurrentDate(DEFAULT_DATE_FORMAT)).append(" ").append( //$NON-NLS-1$
				getCurrentDate(DEFAULT_TIME_FORMAT));
		return buf.toString();
	}
}




 *
 * Contributors:
 *    Composent, Inc. - initial API and implementation
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197604, 197329
 ******************************************************************************/
package org.eclipse.ecf.internal.provider.irc.container;


		connection.addIRCEventListener(getIRCEventListener());
		connection.setPong(true);
		connection.setDaemon(false);
		connection.setColors(true);
		if (encoding != null)
			connection.setEncoding(encoding);
		trace(Messages.IRCRootContainer_Connecting_To + targetID);

		return new IChatRoomMessageSender() {
			public void sendMessage(String message) throws ECFException {
				if (isCommand(message))
					parseCommandAndSend(message, null, null);
				else
					showErrorMessage(null, NLS.bind(
							Messages.IRCRootContainer_Command_Error, message,

		return token;
	}
	
	protected void parseCommandAndSend(String commandMessage, String channelName, String ircUser) {
		synchronized (this) {
			if (connection != null) {
				try {

						if (index != -1) {
							connection.doMode(channelName, commandMessage);
						}
					} else if (lowerCase.startsWith("/me ")) { //$NON-NLS-1$
						nextToken(command); // skip command
						
						String message = command.toString();
						if (message.length() > 0) {
							message = "\01ACTION "+message+"\01"; //$NON-NLS-1$ //$NON-NLS-2$
							connection.doPrivmsg(channelName, message);
							showMessage(channelName, ircUser, message);
						}
					} else {
						String[] tokens = parseCommandTokens(commandMessage);
						handleCommandMessage(tokens, channelName);

		if (connection != null) {
			// If it's a command,
			if (isCommand(msg)) {
				parseCommandAndSend(msg, channelName, ircUser);
			} else {
				connection.doPrivmsg(channelName, msg);
				showMessage(channelName, ircUser, msg);




/****************************************************************************
 * Copyright (c) 2004, 2007 Composent, Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *
 * Contributors:
 *    Composent, Inc. - initial API and implementation
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
 *****************************************************************************/

package org.eclipse.ecf.internal.irc.ui;

import org.eclipse.ecf.presence.chatroom.IChatRoomContainer;
import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
import org.eclipse.ecf.presence.ui.chatroom.ChatRoomManagerUI;
import org.eclipse.ecf.presence.ui.chatroom.IMessageRenderer;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;


		return inputLine;

	}
	
	protected IMessageRenderer getDefaultMessageRenderer() {
		return new IRCMessageRenderer();
	}
}




/****************************************************************************
 * Copyright (c) 2007 Composent, Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
 *****************************************************************************/
package org.eclipse.ecf.internal.irc.ui;

import org.eclipse.ecf.presence.ui.chatroom.MessageRenderer;
import org.eclipse.swt.SWT;

public class IRCMessageRenderer extends MessageRenderer {

	private final static String ME_PREFIX = "\01ACTION "; //$NON-NLS-1$
	private final static String ME_SUFFIX = "\01"; //$NON-NLS-1$

	private boolean isActionMessage;
	
	protected void doRender() {
		String actionMessage = getActionMessage(message);
		isActionMessage = (actionMessage != null);
		
		if (isActionMessage) {
			message = actionMessage;
		}
		
		super.doRender();
	}

	protected void appendNickname() {
		if (isActionMessage) {
			String message = originator + " "; //$NON-NLS-1$
			append(message, null, null, SWT.ITALIC);
		} else {
			super.appendNickname();
		}
	}
	
	protected void appendMessage() {
		if (isActionMessage) {
			append(message, null, null, SWT.ITALIC);
		} else {
			super.appendMessage();
		}
	}
	
	private String getActionMessage(String message) {
		if (message.startsWith(ME_PREFIX) && message.endsWith(ME_SUFFIX)) {
			return message.substring(ME_PREFIX.length(), message.length() - ME_SUFFIX.length());
		} else {
			return null;
		}
	}

	
}

Return to bug 197329

Lines 7-13 Link Here

(-)src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java (-5 / +14 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Composent, Inc. - initial API and implementation	9	* Composent, Inc. - initial API and implementation
10	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197604	10	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197604, 197329
11	******************************************************************************/	11	******************************************************************************/
12	package org.eclipse.ecf.internal.provider.irc.container;	12	package org.eclipse.ecf.internal.provider.irc.container;
13		13
Lines 135-141 Link Here
135	connection.addIRCEventListener(getIRCEventListener());	135	connection.addIRCEventListener(getIRCEventListener());
136	connection.setPong(true);	136	connection.setPong(true);
137	connection.setDaemon(false);	137	connection.setDaemon(false);
138	connection.setColors(false);	138	connection.setColors(true);
139	if (encoding != null)	139	if (encoding != null)
140	connection.setEncoding(encoding);	140	connection.setEncoding(encoding);
141	trace(Messages.IRCRootContainer_Connecting_To + targetID);	141	trace(Messages.IRCRootContainer_Connecting_To + targetID);
Lines 518-524 Link Here
518	return new IChatRoomMessageSender() {	518	return new IChatRoomMessageSender() {
519	public void sendMessage(String message) throws ECFException {	519	public void sendMessage(String message) throws ECFException {
520	if (isCommand(message))	520	if (isCommand(message))
521	parseCommandAndSend(message, null);	521	parseCommandAndSend(message, null, null);
522	else	522	else
523	showErrorMessage(null, NLS.bind(	523	showErrorMessage(null, NLS.bind(
524	Messages.IRCRootContainer_Command_Error, message,	524	Messages.IRCRootContainer_Command_Error, message,
Lines 565-571 Link Here
565	return token;	565	return token;
566	}	566	}
567		567
568	protected void parseCommandAndSend(String commandMessage, String channelName) {	568	protected void parseCommandAndSend(String commandMessage, String channelName, String ircUser) {
569	synchronized (this) {	569	synchronized (this) {
570	if (connection != null) {	570	if (connection != null) {
571	try {	571	try {
Lines 645-650 Link Here
645	if (index != -1) {	645	if (index != -1) {
646	connection.doMode(channelName, commandMessage);	646	connection.doMode(channelName, commandMessage);
647	}	647	}
		648	} else if (lowerCase.startsWith("/me ")) { //$NON-NLS-1$
		649	nextToken(command); // skip command
		650
		651	String message = command.toString();
		652	if (message.length() > 0) {
		653	message = "\01ACTION "+message+"\01"; //$NON-NLS-1$ //$NON-NLS-2$
		654	connection.doPrivmsg(channelName, message);
		655	showMessage(channelName, ircUser, message);
		656	}
648	} else {	657	} else {
649	String[] tokens = parseCommandTokens(commandMessage);	658	String[] tokens = parseCommandTokens(commandMessage);
650	handleCommandMessage(tokens, channelName);	659	handleCommandMessage(tokens, channelName);
Lines 909-915 Link Here
909	if (connection != null) {	918	if (connection != null) {
910	// If it's a command,	919	// If it's a command,
911	if (isCommand(msg)) {	920	if (isCommand(msg)) {
912	parseCommandAndSend(msg, channelName);	921	parseCommandAndSend(msg, channelName, ircUser);
913	} else {	922	} else {
914	connection.doPrivmsg(channelName, msg);	923	connection.doPrivmsg(channelName, msg);
915	showMessage(channelName, ircUser, msg);	924	showMessage(channelName, ircUser, msg);

Lines 7-12 Link Here

(-)src/org/eclipse/ecf/internal/presence/ui/Messages.java (-6 / +5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Composent, Inc. - initial API and implementation	9	* Composent, Inc. - initial API and implementation
		10	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
10	*****************************************************************************/	11	*****************************************************************************/
11		12
12	package org.eclipse.ecf.internal.presence.ui;	13	package org.eclipse.ecf.internal.presence.ui;
Lines 60-67 Link Here
60		61
61	public static String ChatRoomManagerView_COPY_TOOLTIP;	62	public static String ChatRoomManagerView_COPY_TOOLTIP;
62		63
63	public static String ChatRoomManagerView_DATE_FORMAT;
64
65	public static String ChatRoomManagerView_DEFAULT_HOST;	64	public static String ChatRoomManagerView_DEFAULT_HOST;
66		65
67	public static String ChatRoomManagerView_DEFAULT_USER;	66	public static String ChatRoomManagerView_DEFAULT_USER;
Lines 73-80 Link Here
73	public static String ChatRoomManagerView_JOIN_COMMAND;	72	public static String ChatRoomManagerView_JOIN_COMMAND;
74		73
75	public static String ChatRoomManagerView_MESSAGE;	74	public static String ChatRoomManagerView_MESSAGE;
76
77	public static String ChatRoomManagerView_MESSAGE_DATE;
78		75
79	public static String ChatRoomManagerView_NOT_CONNECTED_MESSAGE;	76	public static String ChatRoomManagerView_NOT_CONNECTED_MESSAGE;
80		77
Lines 88-95 Link Here
88		85
89	public static String ChatRoomManagerView_SELECT_ALL_TOOLTIP;	86	public static String ChatRoomManagerView_SELECT_ALL_TOOLTIP;
90		87
91	public static String ChatRoomManagerView_TIME_FORMAT;
92
93	public static String ChatRoomManagerView_VIEW_DISABLED_NAME;	88	public static String ChatRoomManagerView_VIEW_DISABLED_NAME;
94		89
95	public static String ChatRoomManagerView_VIEW_TITLE;	90	public static String ChatRoomManagerView_VIEW_TITLE;
Lines 234-239 Link Here
234		229
235	public static String ToggleOnlineOnlyAction_title;	230	public static String ToggleOnlineOnlyAction_title;
236		231
		232	public static String MessageRenderer_DEFAULT_DATE_FORMAT;
		233	public static String MessageRenderer_DEFAULT_DATETIME_FORMAT;
		234	public static String MessageRenderer_DEFAULT_TIME_FORMAT;
		235
237	static {	236	static {
238	NLS.initializeMessages(BUNDLE_NAME, Messages.class);	237	NLS.initializeMessages(BUNDLE_NAME, Messages.class);
239	}	238	}

Lines 7-12 Link Here

(-)src/org/eclipse/ecf/internal/presence/ui/messages.properties (-7 / +9 lines)
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# Composent, Inc. - initial API and implementation	9	# Composent, Inc. - initial API and implementation
		10	# Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
10	################################################################################	11	################################################################################
11		12
12	##########################	13	##########################
Lines 84-91 Link Here
84	MultiRosterView_DISCONNECT_ACCOUNT_QUESTION_MESSAGE=Disconnect account {0}?	85	MultiRosterView_DISCONNECT_ACCOUNT_QUESTION_MESSAGE=Disconnect account {0}?
85	MultiRosterView_ROSTER_VIEW_EXT_POINT_ERROR_MESSAGE=Error in loading rosterViewerDropTargetExtension	86	MultiRosterView_ROSTER_VIEW_EXT_POINT_ERROR_MESSAGE=Error in loading rosterViewerDropTargetExtension
86	MultiRosterView_EXCEPTION_JOIN_ROOM_INVALID_ACCOUNT=Invalid account	87	MultiRosterView_EXCEPTION_JOIN_ROOM_INVALID_ACCOUNT=Invalid account
87	ChatRoomManagerView_TIME_FORMAT=HH:mm:ss
88	ChatRoomManagerView_DATE_FORMAT=yyyy-MM-dd
89	ChatRoomSelectionDialog_MESSAGE=Select a Chat Room to Enter	88	ChatRoomSelectionDialog_MESSAGE=Select a Chat Room to Enter
90	ChatRoomManagerView_DEFAULT_USER=<user>	89	ChatRoomManagerView_DEFAULT_USER=<user>
91	ChatRoomManagerView_DEFAULT_HOST=<host>	90	ChatRoomManagerView_DEFAULT_HOST=<host>
Lines 111-124 Link Here
111	ChatRoomManagerView_NOT_CONNECTED_TITLE=Not Connected	110	ChatRoomManagerView_NOT_CONNECTED_TITLE=Not Connected
112	ChatRoomManagerView_NOT_CONNECTED_MESSAGE=Not connected to chat room	111	ChatRoomManagerView_NOT_CONNECTED_MESSAGE=Not connected to chat room
113	ChatRoomManagerView_PART_COMMAND=PART	112	ChatRoomManagerView_PART_COMMAND=PART
114	ChatRoomManagerView_ENTERED_MESSAGE=({0}) {1} entered	113	ChatRoomManagerView_ENTERED_MESSAGE={0} entered
115	ChatRoomView_NOT_CONNECTED_MESSAGE=Not connected to chat room	114	ChatRoomView_NOT_CONNECTED_MESSAGE=Not connected to chat room
116	ChatRoomManagerView_LEFT_MESSAGE=({0}) {1} left	115	ChatRoomManagerView_LEFT_MESSAGE={0} left
117	ChangePasswordDialog_CHANGE_PASSWORD=Change Password	116	ChangePasswordDialog_CHANGE_PASSWORD=Change Password
118	ChatRoomManagerView_MESSAGE={0}: {1}\n	117	ChatRoomManagerView_MESSAGE={0}: {1}\n
119	ChatRoomView_TIME_FORMAT=HH:mm:ss	118	ChatRoomView_TIME_FORMAT=HH:mm:ss
120	ChatRoomView_DATE_FORMAT=yyyy-MM-dd	119	ChatRoomView_DATE_FORMAT=yyyy-MM-dd
121	ChatRoomManagerView_MESSAGE_DATE=({0})
122	ChatRoomView_NOT_CONNECTED_TITLE=Not connect	120	ChatRoomView_NOT_CONNECTED_TITLE=Not connect
123	ChatRoomManagerView_CLEAR_CONFIRM_TITLE=Confirm Clear Output	121	ChatRoomManagerView_CLEAR_CONFIRM_TITLE=Confirm Clear Output
124	ChangePasswordDialog_NEW_PASSWORD_LABEL=New Password:	122	ChangePasswordDialog_NEW_PASSWORD_LABEL=New Password:
Lines 138-141 Link Here
138	BrowseDialog_title=Open Contact	136	BrowseDialog_title=Open Contact
139	BrowseDialog_message=Select a contact to message (*, ?, or camel case):	137	BrowseDialog_message=Select a contact to message (*, ?, or camel case):
140	BrowseDialog_scanning=Scanning contacts...	138	BrowseDialog_scanning=Scanning contacts...
141	ToggleOnlineOnlyAction_title=Show Online Only	139	ToggleOnlineOnlyAction_title=Show Online Only
		140
		141	MessageRenderer_DEFAULT_TIME_FORMAT=HH:mm:ss
		142	MessageRenderer_DEFAULT_DATE_FORMAT=yyyy-MM-dd
		143	MessageRenderer_DEFAULT_DATETIME_FORMAT=({0})

Added Link Here

(-)src/org/eclipse/ecf/presence/ui/chatroom/IMessageRenderer.java (+38 lines)
1	/****************************************************************************
2	* Copyright (c) 2007 Composent, Inc. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
10	*****************************************************************************/
11	package org.eclipse.ecf.presence.ui.chatroom;
12
13	import org.eclipse.ecf.internal.presence.ui.ChatLine;
14	import org.eclipse.swt.custom.StyleRange;
15
16	/**
17	* Renders chat line, by arranging text content to be finally printed to
18	* Chat room output together with it's formatting.
19	*
20	*/
21	public interface IMessageRenderer {
22
23	/**
24	* Returns text content to be finally printed to chat room output.
25	* @param message chat message to be processed
26	* @param originator name of message sender
27	* @param localUserName local user name
28	* @return text to be printed to output, nothing will be printed if null
29	*/
30	String render(String message, String originator, String localUserName);
31
32	/**
33	* Returns formatting to be applied to rendered final output, returned by {@link #render(ChatLine, boolean)}.
34	* @return formatting to be applied to output, or null if no formatting
35	*/
36	StyleRange[] getStyleRanges();
37
38	}

Lines 1-5 Link Here

(-)src/org/eclipse/ecf/internal/irc/ui/IRCUI.java (-2 / +7 lines)
1	/****************************************************************************	1	/****************************************************************************
2	* Copyright (c) 2004 Composent, Inc. and others.	2	* Copyright (c) 2004, 2007 Composent, Inc. and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Composent, Inc. - initial API and implementation	9	* Composent, Inc. - initial API and implementation
		10	* Jacek Pospychala <jacek.pospychala@pl.ibm.com> - bug 197329
10	*****************************************************************************/	11	*****************************************************************************/
11		12
12	package org.eclipse.ecf.internal.irc.ui;	13	package org.eclipse.ecf.internal.irc.ui;
Lines 21-26 Link Here
21	import org.eclipse.ecf.presence.chatroom.IChatRoomContainer;	22	import org.eclipse.ecf.presence.chatroom.IChatRoomContainer;
22	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;	23	import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
23	import org.eclipse.ecf.presence.ui.chatroom.ChatRoomManagerUI;	24	import org.eclipse.ecf.presence.ui.chatroom.ChatRoomManagerUI;
		25	import org.eclipse.ecf.presence.ui.chatroom.IMessageRenderer;
24	import org.eclipse.jface.dialogs.MessageDialog;	26	import org.eclipse.jface.dialogs.MessageDialog;
25	import org.eclipse.osgi.util.NLS;	27	import org.eclipse.osgi.util.NLS;
26		28
Lines 120-124 Link Here
120	return inputLine;	122	return inputLine;
121		123
122	}	124	}
123		125
		126	protected IMessageRenderer getDefaultMessageRenderer() {
		127	return new IRCMessageRenderer();
		128	}
124	}	129	}