Attachment #68857 for bug #183192

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 183192
Collapse All | Expand All




import org.eclipse.ecf.presence.chatroom.IChatRoomContainer;
import org.eclipse.ecf.presence.chatroom.IChatRoomMessageSender;
import org.eclipse.ecf.presence.chatroom.IChatRoomParticipantListener;
import org.eclipse.ecf.presence.im.IChatMessageSender;
import org.eclipse.osgi.util.NLS;
import org.schwering.irc.lib.IRCUser;


 * 
 */
public class IRCChannelContainer extends IRCAbstractContainer implements
		IChatMessageSender, IChatRoomContainer {

	private static final long CONNECT_TIMEOUT = 10000;


		this.channelOperator = channelOperator;
	}

	public void sendChatMessage(ID toID, ID threadID,
			org.eclipse.ecf.presence.im.IChatMessage.Type type, String subject,
			String body, Map properties) throws ECFException {
		rootContainer.sendChatMessage(toID, body);
	}

	public void sendChatMessage(ID toID, String body) throws ECFException {
		rootContainer.sendChatMessage(toID, body);
	}
	
	public IChatMessageSender getPrivateMessageSender() {
		return this;
	}

}

Lines 27-32 Link Here

(-)src/org/eclipse/ecf/internal/provider/irc/container/IRCAbstractContainer.java (-1 / +11 lines)
27	import org.eclipse.ecf.presence.chatroom.ChatRoomMessage;	27	import org.eclipse.ecf.presence.chatroom.ChatRoomMessage;
28	import org.eclipse.ecf.presence.chatroom.ChatRoomMessageEvent;	28	import org.eclipse.ecf.presence.chatroom.ChatRoomMessageEvent;
29	import org.eclipse.ecf.presence.chatroom.IChatRoomAdminListener;	29	import org.eclipse.ecf.presence.chatroom.IChatRoomAdminListener;
		30	import org.eclipse.ecf.presence.im.ChatMessage;
		31	import org.eclipse.ecf.presence.im.ChatMessageEvent;
30		32
31	public abstract class IRCAbstractContainer extends AbstractContainer {	33	public abstract class IRCAbstractContainer extends AbstractContainer {
32		34
Lines 63-70 Link Here
63	protected void traceStack(Throwable t, String msg) {	65	protected void traceStack(Throwable t, String msg) {
64	Trace.catching(Activator.PLUGIN_ID, IRCDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), msg, t);	66	Trace.catching(Activator.PLUGIN_ID, IRCDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), msg, t);
65	}	67	}
		68
		69	public void fireChatMessageEvent(ID sender, String msg) {
		70	for (Iterator i = msgListeners.iterator(); i.hasNext();) {
		71	IIMMessageListener l = (IIMMessageListener) i.next();
		72	l.handleMessageEvent(new ChatMessageEvent(sender,
		73	new ChatMessage(sender, msg)));
		74	}
		75	}
66		76
67	public void fireMessageListeners(ID sender, String msg) {	77	public void fireChatRoomMessageEvent(ID sender, String msg) {
68	for (Iterator i = msgListeners.iterator(); i.hasNext();) {	78	for (Iterator i = msgListeners.iterator(); i.hasNext();) {
69	IIMMessageListener l = (IIMMessageListener) i.next();	79	IIMMessageListener l = (IIMMessageListener) i.next();
70	l.handleMessageEvent(new ChatRoomMessageEvent(sender,	80	l.handleMessageEvent(new ChatRoomMessageEvent(sender,

Lines 43-48 Link Here

(-)src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java (-14 / +35 lines)
43	import org.eclipse.ecf.presence.chatroom.IChatRoomParticipantListener;	43	import org.eclipse.ecf.presence.chatroom.IChatRoomParticipantListener;
44	import org.eclipse.ecf.presence.history.IHistory;	44	import org.eclipse.ecf.presence.history.IHistory;
45	import org.eclipse.ecf.presence.history.IHistoryManager;	45	import org.eclipse.ecf.presence.history.IHistoryManager;
		46	import org.eclipse.ecf.presence.im.IChatMessageSender;
		47	import org.eclipse.ecf.presence.im.IChatMessage.Type;
46	import org.eclipse.osgi.util.NLS;	48	import org.eclipse.osgi.util.NLS;
47	import org.schwering.irc.lib.IRCConnection;	49	import org.schwering.irc.lib.IRCConnection;
48	import org.schwering.irc.lib.IRCEventListener;	50	import org.schwering.irc.lib.IRCEventListener;
Lines 57-63 Link Here
57	*	59	*
58	*/	60	*/
59	public class IRCRootContainer extends IRCAbstractContainer implements	61	public class IRCRootContainer extends IRCAbstractContainer implements
60	IContainer, IChatRoomInvitationSender, IChatRoomManager,	62	IContainer, IChatMessageSender, IChatRoomInvitationSender, IChatRoomManager,
61	IChatRoomContainer, IRCMessageChannel, IChatRoomContainerOptionsAdapter {	63	IChatRoomContainer, IRCMessageChannel, IChatRoomContainerOptionsAdapter {
62		64
63	private static final long CONNECT_TIMEOUT = 20000;	65	private static final long CONNECT_TIMEOUT = 20000;
Lines 364-376 Link Here
364	* @see org.eclipse.ecf.core.IContainer#getAdapter(java.lang.Class)	366	* @see org.eclipse.ecf.core.IContainer#getAdapter(java.lang.Class)
365	*/	367	*/
366	public Object getAdapter(Class serviceType) {	368	public Object getAdapter(Class serviceType) {
367	if (serviceType == null)	369	if (serviceType != null && serviceType.isInstance(this)) {
368	return null;	370	return null;
369	if (serviceType.equals(IChatRoomManager.class)	371	} else {
370	\|\| serviceType.equals(IChatRoomContainerOptionsAdapter.class))
371	return this;
372	else
373	return null;	372	return null;
		373	}
374	}	374	}
375		375
376	/*	376	/*
Lines 723-749 Link Here
723	private void showMessage(String channel, String msg) {	723	private void showMessage(String channel, String msg) {
724	IRCChannelContainer msgChannel = getChannel(channel);	724	IRCChannelContainer msgChannel = getChannel(channel);
725	if (msgChannel != null)	725	if (msgChannel != null)
726	msgChannel.fireMessageListeners(createIDFromString(channel), msg);	726	msgChannel.fireChatRoomMessageEvent(createIDFromString(channel), msg);
727	else	727	else
728	fireMessageListeners((channel == null) ? getSystemID()	728	fireChatRoomMessageEvent((channel == null) ? getSystemID()
729	: createIDFromString(channel), msg);	729	: createIDFromString(channel), msg);
730	}	730	}
731		731
732	private void showMessage(String channel, String user, String msg) {	732	private void showMessage(String channel, String user, String msg) {
733	IRCChannelContainer msgChannel = getChannel(channel);	733	IRCChannelContainer msgChannel = getChannel(channel);
734	if (msgChannel != null)	734	if (msgChannel != null) {
735	msgChannel.fireMessageListeners(createIDFromString(user), msg);	735	msgChannel.fireChatRoomMessageEvent(createIDFromString(user), msg);
736	else	736	} else {
737	fireMessageListeners(createIDFromString(user), msg);	737	fireChatMessageEvent(createIDFromString(user), msg);
		738	for (Iterator it = channels.values().iterator(); it.hasNext();) {
		739	msgChannel = (IRCChannelContainer) it.next();
		740	msgChannel.fireChatMessageEvent(createIDFromString(user), msg);
		741	}
		742	}
738	}	743	}
739		744
740	private void showErrorMessage(String channel, String msg) {	745	private void showErrorMessage(String channel, String msg) {
741	IRCChannelContainer msgChannel = getChannel(channel);	746	IRCChannelContainer msgChannel = getChannel(channel);
742	if (msgChannel != null)	747	if (msgChannel != null)
743	msgChannel.fireMessageListeners((username == null) ? getSystemID()	748	msgChannel.fireChatRoomMessageEvent((username == null) ? getSystemID()
744	: createIDFromString(username), msg);	749	: createIDFromString(username), msg);
745	else	750	else
746	fireMessageListeners((username == null) ? getSystemID()	751	fireChatRoomMessageEvent((username == null) ? getSystemID()
747	: createIDFromString(username), msg);	752	: createIDFromString(username), msg);
748	}	753	}
749		754
Lines 970-973 Link Here
970	}	975	}
971	}	976	}
972		977
		978	public void sendChatMessage(ID toID, ID threadID, Type type,
		979	String subject, String body, Map properties) throws ECFException {
		980	sendChatMessage(toID, body);
		981	}
		982
		983	public void sendChatMessage(ID toID, String body) throws ECFException {
		984	if (toID == null) {
		985	throw new ECFException();
		986	}
		987	connection.doPrivmsg(toID.getName(), body);
		988	}
		989
		990	public IChatMessageSender getPrivateMessageSender() {
		991	return this;
		992	}
		993
973	}	994	}

Lines 15-20 Link Here

(-)src/org/eclipse/ecf/internal/provider/irc/container/IRCMessageChannel.java (-1 / +1 lines)
15		15
16	public interface IRCMessageChannel {	16	public interface IRCMessageChannel {
17		17
18	public void fireMessageListeners(ID sender, String msg);	18	public void fireChatRoomMessageEvent(ID sender, String msg);
19		19
20	}	20	}

Return to bug 183192