Attachment #95669 for bug #222253




LineChatClientView.textinputinit=<input chat text here>

LineChatClientView.contextmenu.closeMessageTitle=Confirm Close Collaboration for Project
LineChatClientView.contextmenu.closeMessageMessage=Are you sure you want to close collaboration for ''{0}''?

ClientPreferencePage.PREF_USE_CHAT_WINDOW=Display ECF Collaboration outside of the workbench
ClientPreferencePage.PREF_DISPLAY_TIMESTAMP=Show time for each chat entry
ClientPreferencePage.PREF_CHAT_FONT=Chat window font:
#ClientPreferencePage.PREF_ME_TEXT_COLOR=Chat Text Color For Me:
ClientPreferencePage.PREF_ME_TEXT_COLOR=Chat text color for message:
#ClientPreferencePage.PREF_OTHER_TEXT_COLOR=Chat Text Color For Other:
ClientPreferencePage.PREF_OTHER_TEXT_COLOR=Chat text color for other:
#ClientPreferencePage.PREF_SYSTEM_TEXT_COLOR=Chat Text Color For System:
ClientPreferencePage.PREF_SYSTEM_TEXT_COLOR=Chat text color for system:
ClientPreferencePage.PREF_SHAREDEDITOR_PLAY_EVENTS_IMMEDIATELY=Play shared editor events immediately
ClientPreferencePage.PREF_SHAREDEDITOR_ASK_RECEIVER=Ask receiver for permission to display shared editor events

ConnectionDialog.PAGE_DESCRIPTION=Select protocol provider, complete account info and login
ConnectionDialog.JOINGROUP_FIELDNAME=Group ID:
ConnectionDialog.NICKNAME_FIELDNAME=Nickname:
ConnectionDialog.ECF_DEFAULT_URL=ecftcp://localhost:3282/server
ConnectionDialog.ECF_TEMPLATE_URL=<protocol>://<machinename>:<port>/<servicename>
ConnectionDialog.PAGE_TITLE=Connect with ECF
ConnectionDialog.DEFAULT_CLIENT=ecf.generic.client
ConnectionDialog.Connection_Protocol=Connection Protocol
ConnectionDialog.Login_automatically=Login &automatically at startup
ConnectionDialog.ECF_Connection=ECF Connection
ConnectionDialog.Please_choose_provider=Please choose a provider and supply connection parameters.
ConnectionDialog.Connect=Connect

JoinGroupWizardPage.PAGE_DESCRIPTION=Complete account info and choose 'Finish' to login.
JoinGroupWizardPage.JOINGROUP_FIELDNAME=Group ID:
JoinGroupWizardPage.NICKNAME_FIELDNAME=Nickname:
JoinGroupWizardPage.ECF_DEFAULT_URL=ecftcp://ecf.eclipse.org:3282/server
JoinGroupWizardPage.ECF_TEMPLATE_URL=ecftcp://<server>:<port>/<groupname>
JoinGroupWizardPage.PAGE_TITLE=Connect Generic Client
JoinGroupWizardPage.DEFAULT_CLIENT=ecf.generic.client
JoinGroupWizardPage.Protocol=Protocol:

Lines 11-16 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ui/ChatWindow.java (-2 / +6 lines)
11		11
12	package org.eclipse.ecf.internal.example.collab.ui;	12	package org.eclipse.ecf.internal.example.collab.ui;
13		13
		14	import org.eclipse.ecf.example.collab.share.User;
14	import org.eclipse.ecf.internal.example.collab.Messages;	15	import org.eclipse.ecf.internal.example.collab.Messages;
15	import org.eclipse.ecf.ui.SharedImages;	16	import org.eclipse.ecf.ui.SharedImages;
16	import org.eclipse.jface.viewers.TableViewer;	17	import org.eclipse.jface.viewers.TableViewer;
Lines 48-53 Link Here
48		49
49	private boolean flashing;	50	private boolean flashing;
50		51
		52	private User localUser;
		53
51	private final Runnable flipImage = new Runnable() {	54	private final Runnable flipImage = new Runnable() {
52	public void run() {	55	public void run() {
53	final Shell shell = getShell();	56	final Shell shell = getShell();
Lines 64-73 Link Here
64		67
65	private Flash flash;	68	private Flash flash;
66		69
67	public ChatWindow(LineChatClientView view, TableViewer table, String initText) {	70	public ChatWindow(LineChatClientView view, TableViewer table, User localUser, String initText) {
68	super(null);	71	super(null);
69	this.view = view;	72	this.view = view;
70	this.table = table;	73	this.table = table;
		74	this.localUser = localUser;
71	this.initText = initText;	75	this.initText = initText;
72	addStatusLine();	76	addStatusLine();
73	}	77	}
Lines 116-122 Link Here
116	* @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)	120	* @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
117	*/	121	*/
118	protected Control createContents(Composite parent) {	122	protected Control createContents(Composite parent) {
119	chat = new ChatComposite(view, parent, table, initText, this);	123	chat = new ChatComposite(view, parent, table, localUser, initText, this);
120	chat.setLayoutData(new GridData(GridData.FILL_BOTH));	124	chat.setLayoutData(new GridData(GridData.FILL_BOTH));
121	chat.setFont(parent.getFont());	125	chat.setFont(parent.getFont());
122	return chat;	126	return chat;

Lines 24-29 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ui/TeamChat.java (-4 / +22 lines)
24	import org.eclipse.swt.custom.SashForm;	24	import org.eclipse.swt.custom.SashForm;
25	import org.eclipse.swt.graphics.Image;	25	import org.eclipse.swt.graphics.Image;
26	import org.eclipse.swt.layout.FillLayout;	26	import org.eclipse.swt.layout.FillLayout;
		27	import org.eclipse.swt.layout.GridData;
		28	import org.eclipse.swt.layout.GridLayout;
27	import org.eclipse.swt.widgets.Composite;	29	import org.eclipse.swt.widgets.Composite;
28	import org.eclipse.swt.widgets.Control;	30	import org.eclipse.swt.widgets.Control;
29	import org.eclipse.swt.widgets.ToolBar;	31	import org.eclipse.swt.widgets.ToolBar;
Lines 35-47 Link Here
35	ToolBar bar;	37	ToolBar bar;
36	LineChatClientView view;	38	LineChatClientView view;
37	ChatWindow chatWindow;	39	ChatWindow chatWindow;
		40	User localUser;
38		41
39	static final int DEFAULT_TREE_WIDGET_PERCENT = 15;	42	static final int DEFAULT_TREE_WIDGET_PERCENT = 15;
40		43
41	TeamChat(LineChatClientView view, Composite parent, int options,	44	TeamChat(LineChatClientView view, Composite parent, int options,
42	String initText) {	45	User localUser, String initText) {
43	super(parent, options);	46	super(parent, options);
44		47
		48	this.localUser = localUser;
		49
45	this.view = view;	50	this.view = view;
46	setLayout(new FillLayout());	51	setLayout(new FillLayout());
47	boolean useChatWindow = ClientPlugin.getDefault()	52	boolean useChatWindow = ClientPlugin.getDefault()
Lines 57-74 Link Here
57	w[1] = 100 - w[0];	62	w[1] = 100 - w[0];
58	}	63	}
59		64
		65	Composite left = new Composite(sash, SWT.NONE);
		66	GridLayout layout = new GridLayout();
		67	layout.marginHeight=0;
		68	layout.marginWidth=0;
		69	layout.verticalSpacing=0;
		70	layout.horizontalSpacing=0;
		71	layout.marginTop=1;
		72	layout.marginBottom=0;
		73	layout.marginLeft=0;
		74	layout.marginRight=0;
		75	left.setLayout(layout);
		76
60	tableView = new TableViewer(useChatWindow ? (Composite) this	77	tableView = new TableViewer(useChatWindow ? (Composite) this
61	: (Composite) sash, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL	78	: (Composite) /sash/left, SWT.MULTI \| SWT.H_SCROLL \| SWT.V_SCROLL
62	\| SWT.BORDER);	79	\| SWT.BORDER);
63	tableView.setContentProvider(new ViewContentProvider());	80	tableView.setContentProvider(new ViewContentProvider());
64	tableView.setLabelProvider(new ViewLabelProvider());	81	tableView.setLabelProvider(new ViewLabelProvider());
		82	tableView.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
65		83
66	if (useChatWindow) {	84	if (useChatWindow) {
67	chatWindow = new ChatWindow(view, tableView, initText);	85	chatWindow = new ChatWindow(view, tableView, localUser, initText);
68	chatWindow.create();	86	chatWindow.create();
69	chat = chatWindow.getChat();	87	chat = chatWindow.getChat();
70	} else {	88	} else {
71	chat = new ChatComposite(view, sash, tableView, initText);	89	chat = new ChatComposite(view, sash, tableView, localUser, initText);
72	sash.setWeights(w);	90	sash.setWeights(w);
73	}	91	}
74	}	92	}

Lines 29-34 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ui/ChatComposite.java (-110 / +190 lines)
29	import org.eclipse.ecf.example.collab.share.User;	29	import org.eclipse.ecf.example.collab.share.User;
30	import org.eclipse.ecf.example.collab.share.io.FileTransferParams;	30	import org.eclipse.ecf.example.collab.share.io.FileTransferParams;
31	import org.eclipse.ecf.internal.example.collab.ClientPlugin;	31	import org.eclipse.ecf.internal.example.collab.ClientPlugin;
		32	import org.eclipse.ecf.presence.ui.chatroom.MessageRenderer;
		33	import org.eclipse.ecf.ui.SharedImages;
32	import org.eclipse.ecf.ui.screencapture.IImageSender;	34	import org.eclipse.ecf.ui.screencapture.IImageSender;
33	import org.eclipse.ecf.ui.screencapture.ScreenCaptureJob;	35	import org.eclipse.ecf.ui.screencapture.ScreenCaptureJob;
34	import org.eclipse.jface.action.Action;	36	import org.eclipse.jface.action.Action;
Lines 40-47 Link Here
40	import org.eclipse.jface.dialogs.InputDialog;	42	import org.eclipse.jface.dialogs.InputDialog;
41	import org.eclipse.jface.dialogs.MessageDialog;	43	import org.eclipse.jface.dialogs.MessageDialog;
42	import org.eclipse.jface.preference.IPreferenceStore;	44	import org.eclipse.jface.preference.IPreferenceStore;
43	import org.eclipse.jface.resource.FontRegistry;	45	//import org.eclipse.jface.resource.FontRegistry;
44	import org.eclipse.jface.resource.ImageDescriptor;	46	import org.eclipse.jface.resource.ImageDescriptor;
		47	import org.eclipse.jface.resource.JFaceResources;
45	import org.eclipse.jface.text.Document;	48	import org.eclipse.jface.text.Document;
46	import org.eclipse.jface.text.ITextSelection;	49	import org.eclipse.jface.text.ITextSelection;
47	import org.eclipse.jface.text.TextSelection;	50	import org.eclipse.jface.text.TextSelection;
Lines 59-69 Link Here
59	import org.eclipse.jface.window.Window;	62	import org.eclipse.jface.window.Window;
60	import org.eclipse.osgi.util.NLS;	63	import org.eclipse.osgi.util.NLS;
61	import org.eclipse.swt.SWT;	64	import org.eclipse.swt.SWT;
62	import org.eclipse.swt.custom.SashForm;	65	//import org.eclipse.swt.custom.SashForm;
63	import org.eclipse.swt.custom.StyleRange;	66	import org.eclipse.swt.custom.StyleRange;
64	import org.eclipse.swt.custom.StyledText;	67	import org.eclipse.swt.custom.StyledText;
65	import org.eclipse.swt.events.DisposeEvent;	68	//import org.eclipse.swt.events.DisposeEvent;
66	import org.eclipse.swt.events.DisposeListener;	69	//import org.eclipse.swt.events.DisposeListener;
67	import org.eclipse.swt.events.FocusEvent;	70	import org.eclipse.swt.events.FocusEvent;
68	import org.eclipse.swt.events.FocusListener;	71	import org.eclipse.swt.events.FocusListener;
69	import org.eclipse.swt.events.KeyEvent;	72	import org.eclipse.swt.events.KeyEvent;
Lines 73-83 Link Here
73	import org.eclipse.swt.events.MouseEvent;	76	import org.eclipse.swt.events.MouseEvent;
74	import org.eclipse.swt.events.MouseListener;	77	import org.eclipse.swt.events.MouseListener;
75	import org.eclipse.swt.graphics.Color;	78	import org.eclipse.swt.graphics.Color;
76	import org.eclipse.swt.graphics.FontData;	79	//import org.eclipse.swt.graphics.FontData;
		80	import org.eclipse.swt.graphics.FontMetrics;
		81	import org.eclipse.swt.graphics.GC;
77	import org.eclipse.swt.graphics.Image;	82	import org.eclipse.swt.graphics.Image;
78	import org.eclipse.swt.graphics.ImageData;	83	import org.eclipse.swt.graphics.ImageData;
79	import org.eclipse.swt.layout.FillLayout;	84	//import org.eclipse.swt.layout.FillLayout;
80	import org.eclipse.swt.layout.GridData;	85	import org.eclipse.swt.layout.GridData;
		86	import org.eclipse.swt.layout.GridLayout;
81	import org.eclipse.swt.widgets.Composite;	87	import org.eclipse.swt.widgets.Composite;
82	import org.eclipse.swt.widgets.Control;	88	import org.eclipse.swt.widgets.Control;
83	import org.eclipse.swt.widgets.Display;	89	import org.eclipse.swt.widgets.Display;
Lines 94-109 Link Here
94	import org.eclipse.ui.dialogs.ISelectionStatusValidator;	100	import org.eclipse.ui.dialogs.ISelectionStatusValidator;
95	import org.eclipse.ui.editors.text.EditorsUI;	101	import org.eclipse.ui.editors.text.EditorsUI;
96	import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;	102	import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
		103	//import org.eclipse.ui.part.ViewPart;
97	import org.eclipse.ui.views.IViewCategory;	104	import org.eclipse.ui.views.IViewCategory;
98	import org.eclipse.ui.views.IViewDescriptor;	105	import org.eclipse.ui.views.IViewDescriptor;
99	import org.eclipse.ui.views.IViewRegistry;	106	import org.eclipse.ui.views.IViewRegistry;
100		107
101	public class ChatComposite extends Composite {	108	public class ChatComposite extends Composite {
102	private static final String CHAT_OUTPUT_FONT = "ChatFont"; //$NON-NLS-1$	109	// private static final String CHAT_OUTPUT_FONT = "ChatFont"; //$NON-NLS-1$
103	final LineChatClientView view;	110	final LineChatClientView view;
104	private Color meColor = null;	111	// private Color meColor = null;
105	private Color otherColor = null;	112	// private Color otherColor = null;
106	private Color systemColor = null;	113	// private Color systemColor = null;
107		114
108	Action appShare = null;	115	Action appShare = null;
109		116
Lines 121-132 Link Here
121		128
122	Action showChatWindow;	129	Action showChatWindow;
123		130
124	protected final String TEXT_INPUT_INIT = MessageLoader.getString("LineChatClientView.textinputinit"); //$NON-NLS-1$	131	// protected final String TEXT_INPUT_INIT = MessageLoader.getString("LineChatClientView.textinputinit"); //$NON-NLS-1$
125	protected static final int DEFAULT_INPUT_HEIGHT = 25;	132	protected static final int DEFAULT_INPUT_HEIGHT = 25;
126	protected static final int DEFAULT_INPUT_SEPARATOR = 5;	133	protected static final int DEFAULT_INPUT_SEPARATOR = 5;
127		134
128	Text textinput = null;	135	Text textinput = null;
129	StyledText textoutput = null;	136	StyledText textoutput = null;
		137
		138	MessageRenderer messageRenderer = null;
		139
130	TableViewer tableView = null;	140	TableViewer tableView = null;
131	ChatDropTarget chatDropTarget = null;	141	ChatDropTarget chatDropTarget = null;
132	TreeDropTarget treeDropTarget = null;	142	TreeDropTarget treeDropTarget = null;
Lines 134-194 Link Here
134	ChatWindow chatWindow;	144	ChatWindow chatWindow;
135	boolean typing;	145	boolean typing;
136		146
137	ChatComposite(LineChatClientView view, Composite parent, TableViewer table, String initText) {	147	User localUser;
138	this(view, parent, table, initText, null);	148
		149	ChatComposite(LineChatClientView view, Composite parent, TableViewer table, User localUser, String initText) {
		150	this(view, parent, table, localUser, initText, null);
139	}	151	}
140		152
141	ChatComposite(LineChatClientView view, Composite parent, TableViewer table, String initText, ChatWindow chatWindow) {	153	ChatComposite(LineChatClientView view, Composite parent, TableViewer table, User localUser, String initText, ChatWindow chatWindow) {
142	super(parent, SWT.NONE);	154	super(parent, SWT.NONE);
143	this.view = view;	155	this.view = view;
144	this.chatWindow = chatWindow;	156	this.chatWindow = chatWindow;
145	setLayout(new FillLayout());	157	this.localUser = localUser;
146	meColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_ME_TEXT_COLOR));	158	//setLayout(new FillLayout());
147	otherColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_OTHER_TEXT_COLOR));	159	GridLayout layout = new GridLayout();
148	systemColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_SYSTEM_TEXT_COLOR));	160	layout.marginHeight=0;
		161	layout.marginWidth=0;
		162	layout.verticalSpacing=3;
		163	layout.horizontalSpacing=3;
		164	layout.marginTop=1;
		165	layout.marginBottom=0;
		166	layout.marginRight=1;
		167	setLayout(layout);
		168	// meColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_ME_TEXT_COLOR));
		169	// otherColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_OTHER_TEXT_COLOR));
		170	// systemColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_SYSTEM_TEXT_COLOR));
149	ClientPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new ColorPropertyChangeListener());	171	ClientPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new ColorPropertyChangeListener());
150		172
151	this.addDisposeListener(new DisposeListener() {	173	// this.addDisposeListener(new DisposeListener() {
152		174	//
153	public void widgetDisposed(DisposeEvent e) {	175	// public void widgetDisposed(DisposeEvent e) {
154	if (meColor != null) {	176	// if (meColor != null) {
155	meColor.dispose();	177	// meColor.dispose();
156	}	178	// }
157		179	//
158	if (otherColor != null) {	180	// if (otherColor != null) {
159	otherColor.dispose();	181	// otherColor.dispose();
160	}	182	// }
161		183	//
162	if (systemColor != null) {	184	// if (systemColor != null) {
163	systemColor.dispose();	185	// systemColor.dispose();
164	}	186	// }
165	}	187	// }
166		188	//
167	});	189	// });
168	final SashForm sf = new SashForm(this, SWT.NORMAL);	190
169	sf.setLayout(new FillLayout());	191	//final SashForm sf = new SashForm(this, SWT.NORMAL);
170	sf.setOrientation(SWT.VERTICAL);	192	//sf.setLayout(new FillLayout());
		193	//sf.setOrientation(SWT.VERTICAL);
		194	Composite sf = this;
171		195
172	tableView = table;	196	tableView = table;
173		197
174	textoutput = createStyledTextWidget(sf);	198	textoutput = createStyledTextWidget(sf);
175	textoutput.setLayoutData(new GridData(SWT.FILL));	199	//textoutput.setLayoutData(new GridData(SWT.FILL));
176	final String fontName = ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_CHAT_FONT);	200	textoutput.setLayoutData(new GridData(GridData.FILL_BOTH));
177	if (!(fontName == null) && !(fontName.equals(""))) { //$NON-NLS-1$	201	// final String fontName = ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_CHAT_FONT);
178	final FontRegistry fr = ClientPlugin.getDefault().getFontRegistry();	202	// if (!(fontName == null) && !(fontName.equals(""))) { //$NON-NLS-1$
179	final FontData[] newFont = {new FontData(fontName)};	203	// final FontRegistry fr = ClientPlugin.getDefault().getFontRegistry();
180		204	// final FontData[] newFont = {new FontData(fontName)};
181	fr.put(CHAT_OUTPUT_FONT, newFont);	205	//
182	textoutput.setFont(fr.get(CHAT_OUTPUT_FONT));	206	// fr.put(CHAT_OUTPUT_FONT, newFont);
183	}	207	// textoutput.setFont(fr.get(CHAT_OUTPUT_FONT));
		208	// }
184		209
		210	messageRenderer = new MessageRenderer();
		211
185	ClientPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new FontPropertyChangeListener());	212	ClientPlugin.getDefault().getPluginPreferences().addPropertyChangeListener(new FontPropertyChangeListener());
186		213
187	textoutput.append(initText);	214	String local = localUser.getNickname();
188		215	String output = messageRenderer.render(initText, null, local);
189	textinput = new Text(sf, SWT.SINGLE \| SWT.BORDER);	216	StyleRange[] ranges = messageRenderer.getStyleRanges();
190	textinput.setText(TEXT_INPUT_INIT);	217	int startRange = textoutput.getText().length();
191	textinput.setLayoutData(new GridData(SWT.FILL));	218	textoutput.append(output);
		219	if (ranges != null) {
		220	// set all ranges to start as message line starts
		221	for (int i = 0; i < ranges.length; i++) {
		222	ranges[i].start += startRange;
		223	}
		224	textoutput.replaceStyleRanges(startRange, output.length(), ranges);
		225	}
		226
		227	//textinput = new Text(sf, SWT.SINGLE \| SWT.BORDER);
		228	textinput = new Text(sf, SWT.MULTI \| SWT.BORDER \| SWT.V_SCROLL \| SWT.WRAP);
		229	// textinput.setText(TEXT_INPUT_INIT);
		230	//textinput.setLayoutData(new GridData(SWT.FILL));
		231	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		232	GC gc = new GC(textinput);
		233	gc.setFont(JFaceResources.getDialogFont());
		234	FontMetrics fontMetrics = gc.getFontMetrics();
		235	gc.dispose();
		236	gd.heightHint = fontMetrics.getHeight() * 2;
		237	textinput.setLayoutData(gd);
192		238
193	textinput.selectAll();	239	textinput.selectAll();
194	textinput.addKeyListener(new KeyListener() {	240	textinput.addKeyListener(new KeyListener() {
Lines 202-211 Link Here
202	});	248	});
203	textinput.addFocusListener(new FocusListener() {	249	textinput.addFocusListener(new FocusListener() {
204	public void focusGained(FocusEvent e) {	250	public void focusGained(FocusEvent e) {
205	final String t = textinput.getText();	251	// final String t = textinput.getText();
206	if (t.equals(TEXT_INPUT_INIT)) {	252	// if (t.equals(TEXT_INPUT_INIT)) {
207	textinput.selectAll();	253	// textinput.selectAll();
208	}	254	// }
209	}	255	}
210		256
211	public void focusLost(FocusEvent e) {	257	public void focusLost(FocusEvent e) {
Lines 219-228 Link Here
219	}	265	}
220		266
221	public void mouseUp(MouseEvent e) {	267	public void mouseUp(MouseEvent e) {
222	final String t = textinput.getText();	268	// final String t = textinput.getText();
223	if (t.equals(TEXT_INPUT_INIT)) {	269	// if (t.equals(TEXT_INPUT_INIT)) {
224	textinput.selectAll();	270	// textinput.selectAll();
225	}	271	// }
226	}	272	}
227	});	273	});
228	textinput.addModifyListener(new ModifyListener() {	274	textinput.addModifyListener(new ModifyListener() {
Lines 236-242 Link Here
236	}	282	}
237	});	283	});
238		284
239	sf.setWeights(new int[] {90, 10});	285	//sf.setWeights(new int[] {90, 10});
		286
240	// make actions	287	// make actions
241	makeActions();	288	makeActions();
242	hookContextMenu();	289	hookContextMenu();
Lines 265-296 Link Here
265	}	312	}
266		313
267	final User user = text.getOriginator();	314	final User user = text.getOriginator();
268	final StyleRange range = new StyleRange();	315
269	range.start = textoutput.getText().length();	316	String name = (user!=null)? user.getNickname() : null;
270	if (user != null) {	317	String local = localUser.getNickname();
271	String prefix = user.getNickname() + ": "; //$NON-NLS-1$	318	String output = messageRenderer.render(text.getText(), name, local);
272	final String date = text.getDate();	319	StyleRange[] ranges = messageRenderer.getStyleRanges();
273	if (date != null && !date.equals("")) { //$NON-NLS-1$	320
274	prefix = date + ' ' + prefix;	321	// final StyleRange range = new StyleRange();
275	}	322	// range.start = textoutput.getText().length();
276	range.length = prefix.length();	323	// if (user != null) {
277	range.foreground = user.equals(view.userdata) ? meColor : otherColor;	324	// String prefix = user.getNickname() + ": "; //$NON-NLS-1$
278	textoutput.append(prefix);	325	// final String date = text.getDate();
279	textoutput.setStyleRange(range);	326	// if (date != null && !date.equals("")) { //$NON-NLS-1$
280	textoutput.append(text.getText());	327	// prefix = date + ' ' + prefix;
281	} else {	328	// }
282	String content = text.getText();	329	// range.length = prefix.length();
283	final String date = text.getDate();	330	// range.foreground = user.equals(view.userdata) ? meColor : otherColor;
284	if (date != null && !date.equals("")) { //$NON-NLS-1$	331	// textoutput.append(prefix);
285	content = date + ' ' + content;	332	// textoutput.setStyleRange(range);
286	}	333	// //textoutput.append(text.getText());
287	range.length = content.length();	334	// String content = text.getText();
288	range.foreground = otherColor;	335	// int startLength = textoutput.getText().length();
289	textoutput.append(content);	336	// hyperlinkRenderer.scan(content);
		337	// textoutput.append(content);
		338	// hyperlinkRenderer.setStyleRange(startLength, null);
		339	// } else {
		340	// String content = text.getText();
		341	// final String date = text.getDate();
		342	// if (date != null && !date.equals("")) { //$NON-NLS-1$
		343	// content = date + ' ' + content;
		344	// }
		345	// range.length = content.length();
		346	// range.foreground = otherColor;
		347	//
		348	// int startLength = textoutput.getText().length();
		349	// hyperlinkRenderer.scan(content);
		350	// textoutput.append(content);
		351	// hyperlinkRenderer.setStyleRange(startLength, null);
		352	// }
		353
		354	if (output == null) {
		355	return;
290	}	356	}
291		357
		358	int startRange = textoutput.getText().length();
		359
292	if (!text.isNoCRLF()) {	360	if (!text.isNoCRLF()) {
293	textoutput.append(Text.DELIMITER);	361	output = output+Text.DELIMITER;
		362	}
		363
		364	textoutput.append(output);
		365
		366	if (ranges != null) {
		367
		368	// set all ranges to start as message line starts
		369	for (int i = 0; i < ranges.length; i++) {
		370	ranges[i].start += startRange;
		371	}
		372	textoutput.replaceStyleRanges(startRange, output.length(), ranges);
294	}	373	}
295		374
296	// scroll to end	375	// scroll to end
Lines 635-641 Link Here
635	}	714	}
636	};	715	};
637	coBrowseURL.setText(MessageLoader.getString("LineChatClientView.contextmenu.cobrowse")); //$NON-NLS-1$	716	coBrowseURL.setText(MessageLoader.getString("LineChatClientView.contextmenu.cobrowse")); //$NON-NLS-1$
638		717
639	appShare = new Action() {	718	appShare = new Action() {
640	public void run() {	719	public void run() {
641	}	720	}
Lines 843-850 Link Here
843	}	922	}
844		923
845	protected void outputClear() {	924	protected void outputClear() {
846	if (MessageDialog.openConfirm(null, MessageLoader.getString("ChatComposite.DIALOG_CONFIRM_CLEAR_TITLE"), MessageLoader.getString("ChatComposite.DIALOG_CONFIRM_CLEAR_TEXT"))) //$NON-NLS-1$ //$NON-NLS-2$	925	if (MessageDialog.openConfirm(null, MessageLoader.getString("ChatComposite.DIALOG_CONFIRM_CLEAR_TITLE"), MessageLoader.getString("ChatComposite.DIALOG_CONFIRM_CLEAR_TEXT"))) { //$NON-NLS-1$ //$NON-NLS-2$
847	textoutput.setText(""); //$NON-NLS-1$	926	textoutput.setText(""); //$NON-NLS-1$
		927	}
848	}	928	}
849		929
850	protected void outputCopy() {	930	protected void outputCopy() {
Lines 1034-1047 Link Here
1034	treeDropTarget = new TreeDropTarget(view, tableView.getControl(), this);	1114	treeDropTarget = new TreeDropTarget(view, tableView.getControl(), this);
1035	}	1115	}
1036		1116
1037	private Color colorFromRGBString(String rgb) {	1117	// private Color colorFromRGBString(String rgb) {
1038	if (rgb == null \|\| rgb.equals("")) { //$NON-NLS-1$	1118	// if (rgb == null \|\| rgb.equals("")) { //$NON-NLS-1$
1039	return new Color(getShell().getDisplay(), 0, 0, 0);	1119	// return new Color(getShell().getDisplay(), 0, 0, 0);
1040	} else {	1120	// } else {
1041	final String[] vals = rgb.split(","); //$NON-NLS-1$	1121	// final String[] vals = rgb.split(","); //$NON-NLS-1$
1042	return new Color(getShell().getDisplay(), Integer.parseInt(vals[0]), Integer.parseInt(vals[1]), Integer.parseInt(vals[2]));	1122	// return new Color(getShell().getDisplay(), Integer.parseInt(vals[0]), Integer.parseInt(vals[1]), Integer.parseInt(vals[2]));
1043	}	1123	// }
1044	}	1124	// }
1045		1125
1046	private class ColorPropertyChangeListener implements org.eclipse.core.runtime.Preferences.IPropertyChangeListener {	1126	private class ColorPropertyChangeListener implements org.eclipse.core.runtime.Preferences.IPropertyChangeListener {
1047		1127
Lines 1051-1062 Link Here
1051	* @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)	1131	* @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
1052	*/	1132	*/
1053	public void propertyChange(PropertyChangeEvent event) {	1133	public void propertyChange(PropertyChangeEvent event) {
1054	meColor.dispose();	1134	// meColor.dispose();
1055	otherColor.dispose();	1135	// otherColor.dispose();
1056	systemColor.dispose();	1136	// systemColor.dispose();
1057	meColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_ME_TEXT_COLOR));	1137	// meColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_ME_TEXT_COLOR));
1058	otherColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_OTHER_TEXT_COLOR));	1138	// otherColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_OTHER_TEXT_COLOR));
1059	systemColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_SYSTEM_TEXT_COLOR));	1139	// systemColor = colorFromRGBString(ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_SYSTEM_TEXT_COLOR));
1060	}	1140	}
1061		1141
1062	}	1142	}
Lines 1068-1083 Link Here
1068	* @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)	1148	* @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
1069	*/	1149	*/
1070	public void propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) {	1150	public void propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent event) {
1071	if (event.getProperty().equals(ClientPlugin.PREF_CHAT_FONT)) {	1151	// if (event.getProperty().equals(ClientPlugin.PREF_CHAT_FONT)) {
1072	final String fontName = ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_CHAT_FONT);	1152	// final String fontName = ClientPlugin.getDefault().getPluginPreferences().getString(ClientPlugin.PREF_CHAT_FONT);
1073	if (!(fontName == null) && !(fontName.equals(""))) { //$NON-NLS-1$	1153	// if (!(fontName == null) && !(fontName.equals(""))) { //$NON-NLS-1$
1074	final FontRegistry fr = ClientPlugin.getDefault().getFontRegistry();	1154	// final FontRegistry fr = ClientPlugin.getDefault().getFontRegistry();
1075	final FontData[] newFont = {new FontData(fontName)};	1155	// final FontData[] newFont = {new FontData(fontName)};
1076		1156	//
1077	fr.put(CHAT_OUTPUT_FONT, newFont);	1157	// fr.put(CHAT_OUTPUT_FONT, newFont);
1078	textoutput.setFont(fr.get(CHAT_OUTPUT_FONT));	1158	// textoutput.setFont(fr.get(CHAT_OUTPUT_FONT));
1079	}	1159	// }
1080	}	1160	// }
1081	}	1161	}
1082		1162
1083	}	1163	}





		this.getPreferenceStore().setDefault(ClientPlugin.PREF_USE_CHAT_WINDOW,
				false);
//		this.getPreferenceStore().setDefault(
//				ClientPlugin.PREF_DISPLAY_TIMESTAMP, true);

		// this.getPreferenceStore().setDefault(ClientPlugin.PREF_CHAT_FONT,
		// "");

		addField(new BooleanFieldEditor(ClientPlugin.PREF_USE_CHAT_WINDOW,
				Messages.ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT,
				getFieldEditorParent()));
//		addField(new BooleanFieldEditor(ClientPlugin.PREF_DISPLAY_TIMESTAMP,
//				Messages.ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD, getFieldEditorParent()));
//		addField(new FontFieldEditor(ClientPlugin.PREF_CHAT_FONT,
//				Messages.ClientPreferencePage_CHAT_WINDOW_FONT_FIELD, getFieldEditorParent()));
		// addField(new
		// BooleanFieldEditor(ClientPlugin.PREF_CONFIRM_FILE_RECEIVE, "Confirm
		// before receiving file.", getFieldEditorParent()));
		// addField(new SpacerFieldEditor(
		// getFieldEditorParent()));
//		addField(new ColorFieldEditor(ClientPlugin.PREF_ME_TEXT_COLOR,
//				Messages.ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD, getFieldEditorParent()));
//		addField(new ColorFieldEditor(ClientPlugin.PREF_OTHER_TEXT_COLOR,
//				Messages.ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD, getFieldEditorParent()));
//		addField(new ColorFieldEditor(ClientPlugin.PREF_SYSTEM_TEXT_COLOR,
//				Messages.ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD, getFieldEditorParent()));
		addField(new SpacerFieldEditor(getFieldEditorParent()));

		playImmediate = new BooleanFieldEditor(




	public static final String SHOWURLARGTYPES[] = {ID.class.getName(), "java.lang.String"}; //$NON-NLS-1$
	public static final String SHOWURLCLASSNAME = ShowURLSharedObject.class.getName();

//	private boolean showTimestamp = ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_DISPLAY_TIMESTAMP);
	//private final SimpleDateFormat df = new SimpleDateFormat("MM/dd hh:mm a"); //$NON-NLS-1$
	private final SimpleDateFormat df = new SimpleDateFormat("hh:MM:ss"); //$NON-NLS-1$
	String downloaddir;
	EclipseCollabSharedObject lch;
	Hashtable myNames = new Hashtable();

		this.lch = lch;
		this.view = view;
		this.name = name;
		this.teamChat = new TeamChat(this, view.tabFolder, SWT.NULL, initText);
		this.userdata = lch.getUser();
		this.teamChat = new TeamChat(this, view.tabFolder, SWT.NULL, userdata, initText);
		this.downloaddir = downloaddir;
		users = new ArrayList();
		teamChat.getTableViewer().setInput(users);

		view.getSite().setSelectionProvider(teamChat.getTableViewer());

		if (userdata != null)
			addUser(userdata);

		ClientPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {

			public void propertyChange(PropertyChangeEvent event) {
//				if (event.getProperty().equals(ClientPlugin.PREF_DISPLAY_TIMESTAMP)) {
//					showTimestamp = ((Boolean) event.getNewValue()).booleanValue();
//				}
			}

		});

	}

	public void showLine(ChatLine line) {
//		if (showTimestamp) {
//			line.setDate(getCurrentDateTime());
//		}
		appendAndScrollToBottom(line);
	}


Lines 53-59 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ClientPlugin.java (-1 / +1 lines)
53		53
54	protected void setPreferenceDefaults() {	54	protected void setPreferenceDefaults() {
55	this.getPreferenceStore().setDefault(ClientPlugin.PREF_USE_CHAT_WINDOW, false);	55	this.getPreferenceStore().setDefault(ClientPlugin.PREF_USE_CHAT_WINDOW, false);
56	this.getPreferenceStore().setDefault(ClientPlugin.PREF_DISPLAY_TIMESTAMP, true);	56	// this.getPreferenceStore().setDefault(ClientPlugin.PREF_DISPLAY_TIMESTAMP, true);
57	// this.getPreferenceStore().setDefault(ClientPlugin.PREF_CHAT_FONT,	57	// this.getPreferenceStore().setDefault(ClientPlugin.PREF_CHAT_FONT,
58	// "");	58	// "");
59	this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_SEND, true);	59	this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_SEND, true);




	public static String AutoLoginPreferencePage_URILISTEDITOR_TEXT;
	public static String ChatWindow_SHELL_TEXT;
	public static String ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION;
//	public static String ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD;
//	public static String ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD;
//	public static String ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD;
//	public static String ClientPreferencePage_CHAT_WINDOW_FONT_FIELD;
	public static String ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY;
//	public static String ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD;
	public static String ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT;
	public static String CollabClient_WORKSPACE_NAME;
	public static String CollabStart_EXCEPTION_STARTING_CONNECTION;




	 * Contants for perference items.
	 */
	public static final String PREF_USE_CHAT_WINDOW = "useChatWindow"; //$NON-NLS-1$
//	public static final String PREF_DISPLAY_TIMESTAMP = "displayTimeStamp"; //$NON-NLS-1$
//	public static final String PREF_CHAT_FONT = "chatFont"; //$NON-NLS-1$
	public static final String PREF_FILE_TRANSFER_RATE = "fileTransferRate"; //$NON-NLS-1$
	public static final String PREF_CONFIRM_FILE_SEND = "confirmFileSend"; //$NON-NLS-1$
	public static final String PREF_CONFIRM_REMOTE_VIEW = "confirmRemoteView"; //$NON-NLS-1$
	public static final String PREF_FILE_SEND_PATH = "findSendPath"; //$NON-NLS-1$
	public static final String PREF_CONFIRM_FILE_RECEIVE = "confirmFileReceive"; //$NON-NLS-1$
//	public static final String PREF_ME_TEXT_COLOR = "prefMeTextColor"; //$NON-NLS-1$
//	public static final String PREF_OTHER_TEXT_COLOR = "prefOtherTextColor"; //$NON-NLS-1$
//	public static final String PREF_SYSTEM_TEXT_COLOR = "prefSystemTextColor"; //$NON-NLS-1$

	public static final String PREF_START_SERVER = "startServerOnStartup"; //$NON-NLS-1$
	public static final String PREF_REGISTER_SERVER = "registerServerOnStartup"; //$NON-NLS-1$




AutoLoginPreferencePage_URILISTEDITOR_TEXT=The following will be connected upon ECF start
ChatWindow_SHELL_TEXT=Team Chat {0}
ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION=Ask receiver for permission to display shared editor events
#ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD=Chat Text Color For Me:
#ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD=Chat Text Color For System:
#ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD=Chat Text Color For Other:
#ClientPreferencePage_CHAT_WINDOW_FONT_FIELD=Chat window font:
ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY=Play shared editor events immediately
#ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD=Show time for each chat entry
ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT=Display ECF Collaboration outside of the workbench
CollabClient_WORKSPACE_NAME=<workspace>
CollabStart_EXCEPTION_STARTING_CONNECTION=Exception in starting connection

Lines 28-32 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
28	org.eclipse.ecf.discovery.ui,	28	org.eclipse.ecf.discovery.ui,
29	org.eclipse.ecf.provider,	29	org.eclipse.ecf.provider,
30	org.eclipse.ecf.ui,	30	org.eclipse.ecf.ui,
31	org.eclipse.ecf.server.generic	31	org.eclipse.ecf.server.generic,
		32	org.eclipse.ecf.presence.ui
32	Bundle-ActivationPolicy: lazy	33	Bundle-ActivationPolicy: lazy

Return to bug 222253

Lines 84-87 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ui/MessageLoader.properties (-1 / +35 lines)
84	LineChatClientView.textinputinit=<input chat text here>	84	LineChatClientView.textinputinit=<input chat text here>
85		85
86	LineChatClientView.contextmenu.closeMessageTitle=Confirm Close Collaboration for Project	86	LineChatClientView.contextmenu.closeMessageTitle=Confirm Close Collaboration for Project
87	LineChatClientView.contextmenu.closeMessageMessage=Are you sure you want to close collaboration for ''{0}''?	87	LineChatClientView.contextmenu.closeMessageMessage=Are you sure you want to close collaboration for ''{0}''?
		88
		89	ClientPreferencePage.PREF_USE_CHAT_WINDOW=Display ECF Collaboration outside of the workbench
		90	ClientPreferencePage.PREF_DISPLAY_TIMESTAMP=Show time for each chat entry
		91	ClientPreferencePage.PREF_CHAT_FONT=Chat window font:
		92	#ClientPreferencePage.PREF_ME_TEXT_COLOR=Chat Text Color For Me:
		93	ClientPreferencePage.PREF_ME_TEXT_COLOR=Chat text color for message:
		94	#ClientPreferencePage.PREF_OTHER_TEXT_COLOR=Chat Text Color For Other:
		95	ClientPreferencePage.PREF_OTHER_TEXT_COLOR=Chat text color for other:
		96	#ClientPreferencePage.PREF_SYSTEM_TEXT_COLOR=Chat Text Color For System:
		97	ClientPreferencePage.PREF_SYSTEM_TEXT_COLOR=Chat text color for system:
		98	ClientPreferencePage.PREF_SHAREDEDITOR_PLAY_EVENTS_IMMEDIATELY=Play shared editor events immediately
		99	ClientPreferencePage.PREF_SHAREDEDITOR_ASK_RECEIVER=Ask receiver for permission to display shared editor events
		100
		101	ConnectionDialog.PAGE_DESCRIPTION=Select protocol provider, complete account info and login
		102	ConnectionDialog.JOINGROUP_FIELDNAME=Group ID:
		103	ConnectionDialog.NICKNAME_FIELDNAME=Nickname:
		104	ConnectionDialog.ECF_DEFAULT_URL=ecftcp://localhost:3282/server
		105	ConnectionDialog.ECF_TEMPLATE_URL=<protocol>://<machinename>:<port>/<servicename>
		106	ConnectionDialog.PAGE_TITLE=Connect with ECF
		107	ConnectionDialog.DEFAULT_CLIENT=ecf.generic.client
		108	ConnectionDialog.Connection_Protocol=Connection Protocol
		109	ConnectionDialog.Login_automatically=Login &automatically at startup
		110	ConnectionDialog.ECF_Connection=ECF Connection
		111	ConnectionDialog.Please_choose_provider=Please choose a provider and supply connection parameters.
		112	ConnectionDialog.Connect=Connect
		113
		114	JoinGroupWizardPage.PAGE_DESCRIPTION=Complete account info and choose 'Finish' to login.
		115	JoinGroupWizardPage.JOINGROUP_FIELDNAME=Group ID:
		116	JoinGroupWizardPage.NICKNAME_FIELDNAME=Nickname:
		117	JoinGroupWizardPage.ECF_DEFAULT_URL=ecftcp://ecf.eclipse.org:3282/server
		118	JoinGroupWizardPage.ECF_TEMPLATE_URL=ecftcp://<server>:<port>/<groupname>
		119	JoinGroupWizardPage.PAGE_TITLE=Connect Generic Client
		120	JoinGroupWizardPage.DEFAULT_CLIENT=ecf.generic.client
		121	JoinGroupWizardPage.Protocol=Protocol:

Lines 61-68 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ui/LineChatClientView.java (-9 / +13 lines)
61	public static final String SHOWURLARGTYPES[] = {ID.class.getName(), "java.lang.String"}; //$NON-NLS-1$	61	public static final String SHOWURLARGTYPES[] = {ID.class.getName(), "java.lang.String"}; //$NON-NLS-1$
62	public static final String SHOWURLCLASSNAME = ShowURLSharedObject.class.getName();	62	public static final String SHOWURLCLASSNAME = ShowURLSharedObject.class.getName();
63		63
64	private boolean showTimestamp = ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_DISPLAY_TIMESTAMP);	64	// private boolean showTimestamp = ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_DISPLAY_TIMESTAMP);
65	private final SimpleDateFormat df = new SimpleDateFormat("MM/dd hh:mm a"); //$NON-NLS-1$	65	//private final SimpleDateFormat df = new SimpleDateFormat("MM/dd hh:mm a"); //$NON-NLS-1$
		66	private final SimpleDateFormat df = new SimpleDateFormat("hh:MM:ss"); //$NON-NLS-1$
66	String downloaddir;	67	String downloaddir;
67	EclipseCollabSharedObject lch;	68	EclipseCollabSharedObject lch;
68	Hashtable myNames = new Hashtable();	69	Hashtable myNames = new Hashtable();
Lines 78-97 Link Here
78	this.lch = lch;	79	this.lch = lch;
79	this.view = view;	80	this.view = view;
80	this.name = name;	81	this.name = name;
81	this.teamChat = new TeamChat(this, view.tabFolder, SWT.NULL, initText);
82	this.userdata = lch.getUser();	82	this.userdata = lch.getUser();
		83	this.teamChat = new TeamChat(this, view.tabFolder, SWT.NULL, userdata, initText);
83	this.downloaddir = downloaddir;	84	this.downloaddir = downloaddir;
84	users = new ArrayList();	85	users = new ArrayList();
85	teamChat.getTableViewer().setInput(users);	86	teamChat.getTableViewer().setInput(users);
		87
		88	view.getSite().setSelectionProvider(teamChat.getTableViewer());
		89
86	if (userdata != null)	90	if (userdata != null)
87	addUser(userdata);	91	addUser(userdata);
88		92
89	ClientPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {	93	ClientPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {
90		94
91	public void propertyChange(PropertyChangeEvent event) {	95	public void propertyChange(PropertyChangeEvent event) {
92	if (event.getProperty().equals(ClientPlugin.PREF_DISPLAY_TIMESTAMP)) {	96	// if (event.getProperty().equals(ClientPlugin.PREF_DISPLAY_TIMESTAMP)) {
93	showTimestamp = ((Boolean) event.getNewValue()).booleanValue();	97	// showTimestamp = ((Boolean) event.getNewValue()).booleanValue();
94	}	98	// }
95	}	99	}
96		100
97	});	101	});
Lines 331-339 Link Here
331	}	335	}
332		336
333	public void showLine(ChatLine line) {	337	public void showLine(ChatLine line) {
334	if (showTimestamp) {	338	// if (showTimestamp) {
335	line.setDate(getCurrentDateTime());	339	// line.setDate(getCurrentDateTime());
336	}	340	// }
337	appendAndScrollToBottom(line);	341	appendAndScrollToBottom(line);
338	}	342	}
339		343

Lines 23-34 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/Messages.java (-5 / +5 lines)
23	public static String AutoLoginPreferencePage_URILISTEDITOR_TEXT;	23	public static String AutoLoginPreferencePage_URILISTEDITOR_TEXT;
24	public static String ChatWindow_SHELL_TEXT;	24	public static String ChatWindow_SHELL_TEXT;
25	public static String ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION;	25	public static String ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION;
26	public static String ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD;	26	// public static String ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD;
27	public static String ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD;	27	// public static String ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD;
28	public static String ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD;	28	// public static String ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD;
29	public static String ClientPreferencePage_CHAT_WINDOW_FONT_FIELD;	29	// public static String ClientPreferencePage_CHAT_WINDOW_FONT_FIELD;
30	public static String ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY;	30	public static String ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY;
31	public static String ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD;	31	// public static String ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD;
32	public static String ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT;	32	public static String ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT;
33	public static String CollabClient_WORKSPACE_NAME;	33	public static String CollabClient_WORKSPACE_NAME;
34	public static String CollabStart_EXCEPTION_STARTING_CONNECTION;	34	public static String CollabStart_EXCEPTION_STARTING_CONNECTION;

Lines 21-36 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/ClientPluginConstants.java (-5 / +5 lines)
21	* Contants for perference items.	21	* Contants for perference items.
22	*/	22	*/
23	public static final String PREF_USE_CHAT_WINDOW = "useChatWindow"; //$NON-NLS-1$	23	public static final String PREF_USE_CHAT_WINDOW = "useChatWindow"; //$NON-NLS-1$
24	public static final String PREF_DISPLAY_TIMESTAMP = "displayTimeStamp"; //$NON-NLS-1$	24	// public static final String PREF_DISPLAY_TIMESTAMP = "displayTimeStamp"; //$NON-NLS-1$
25	public static final String PREF_CHAT_FONT = "chatFont"; //$NON-NLS-1$	25	// public static final String PREF_CHAT_FONT = "chatFont"; //$NON-NLS-1$
26	public static final String PREF_FILE_TRANSFER_RATE = "fileTransferRate"; //$NON-NLS-1$	26	public static final String PREF_FILE_TRANSFER_RATE = "fileTransferRate"; //$NON-NLS-1$
27	public static final String PREF_CONFIRM_FILE_SEND = "confirmFileSend"; //$NON-NLS-1$	27	public static final String PREF_CONFIRM_FILE_SEND = "confirmFileSend"; //$NON-NLS-1$
28	public static final String PREF_CONFIRM_REMOTE_VIEW = "confirmRemoteView"; //$NON-NLS-1$	28	public static final String PREF_CONFIRM_REMOTE_VIEW = "confirmRemoteView"; //$NON-NLS-1$
29	public static final String PREF_FILE_SEND_PATH = "findSendPath"; //$NON-NLS-1$	29	public static final String PREF_FILE_SEND_PATH = "findSendPath"; //$NON-NLS-1$
30	public static final String PREF_CONFIRM_FILE_RECEIVE = "confirmFileReceive"; //$NON-NLS-1$	30	public static final String PREF_CONFIRM_FILE_RECEIVE = "confirmFileReceive"; //$NON-NLS-1$
31	public static final String PREF_ME_TEXT_COLOR = "prefMeTextColor"; //$NON-NLS-1$	31	// public static final String PREF_ME_TEXT_COLOR = "prefMeTextColor"; //$NON-NLS-1$
32	public static final String PREF_OTHER_TEXT_COLOR = "prefOtherTextColor"; //$NON-NLS-1$	32	// public static final String PREF_OTHER_TEXT_COLOR = "prefOtherTextColor"; //$NON-NLS-1$
33	public static final String PREF_SYSTEM_TEXT_COLOR = "prefSystemTextColor"; //$NON-NLS-1$	33	// public static final String PREF_SYSTEM_TEXT_COLOR = "prefSystemTextColor"; //$NON-NLS-1$
34		34
35	public static final String PREF_START_SERVER = "startServerOnStartup"; //$NON-NLS-1$	35	public static final String PREF_START_SERVER = "startServerOnStartup"; //$NON-NLS-1$
36	public static final String PREF_REGISTER_SERVER = "registerServerOnStartup"; //$NON-NLS-1$	36	public static final String PREF_REGISTER_SERVER = "registerServerOnStartup"; //$NON-NLS-1$

Lines 3-14 Link Here

(-)src/org/eclipse/ecf/internal/example/collab/messages.properties (-5 / +5 lines)
3	AutoLoginPreferencePage_URILISTEDITOR_TEXT=The following will be connected upon ECF start	3	AutoLoginPreferencePage_URILISTEDITOR_TEXT=The following will be connected upon ECF start
4	ChatWindow_SHELL_TEXT=Team Chat {0}	4	ChatWindow_SHELL_TEXT=Team Chat {0}
5	ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION=Ask receiver for permission to display shared editor events	5	ClientPreferencePage_ASK_RECEIVER_FOR_PERMISSION=Ask receiver for permission to display shared editor events
6	ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD=Chat Text Color For Me:	6	#ClientPreferencePage_CHAT_COLOR_FOR_ME_FIELD=Chat Text Color For Me:
7	ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD=Chat Text Color For System:	7	#ClientPreferencePage_CHAT_COLOR_FOR_SYSTEM_FIELD=Chat Text Color For System:
8	ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD=Chat Text Color For Other:	8	#ClientPreferencePage_CHAT_TEXT_COLOR_FOR_OTHER_FIELD=Chat Text Color For Other:
9	ClientPreferencePage_CHAT_WINDOW_FONT_FIELD=Chat window font:	9	#ClientPreferencePage_CHAT_WINDOW_FONT_FIELD=Chat window font:
10	ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY=Play shared editor events immediately	10	ClientPreferencePage_PLAY_EDITOR_EVENTS_IMMEDIATELY=Play shared editor events immediately
11	ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD=Show time for each chat entry	11	#ClientPreferencePage_SHOW_TIME_FOR_CHAT_FIELD=Show time for each chat entry
12	ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT=Display ECF Collaboration outside of the workbench	12	ClientPreferencePage_USE_CHAT_WINDOW_FIELD_TEXT=Display ECF Collaboration outside of the workbench
13	CollabClient_WORKSPACE_NAME=<workspace>	13	CollabClient_WORKSPACE_NAME=<workspace>
14	CollabStart_EXCEPTION_STARTING_CONNECTION=Exception in starting connection	14	CollabStart_EXCEPTION_STARTING_CONNECTION=Exception in starting connection