Attachment #208729 for bug #364661

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

Lines 11-16 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/progress/ProgressMessages.java (+12 lines)
11	package org.eclipse.ui.internal.progress;	11	package org.eclipse.ui.internal.progress;
12		12
13	import org.eclipse.rwt.RWT;	13	import org.eclipse.rwt.RWT;
		14	import org.eclipse.rwt.lifecycle.UICallBack;
		15	import org.eclipse.swt.widgets.Display;
14		16
15	// RAP [fappel]: NLS needs to be session/request aware	17	// RAP [fappel]: NLS needs to be session/request aware
16	//public class ProgressMessages extends NLS{	18	//public class ProgressMessages extends NLS{
Lines 138-141 Link Here
138	Object result = RWT.NLS.getISO8859_1Encoded( BUNDLE_NAME, clazz );	140	Object result = RWT.NLS.getISO8859_1Encoded( BUNDLE_NAME, clazz );
139	return ( ProgressMessages )result;	141	return ( ProgressMessages )result;
140	}	142	}
		143
		144	public static ProgressMessages get( Display display ) {
		145	final ProgressMessages[] result = { null };
		146	UICallBack.runNonUIThreadWithFakeContext( display, new Runnable() {
		147	public void run() {
		148	result[ 0 ] = get();
		149	}
		150	} );
		151	return result[ 0 ];
		152	}
141	}	153	}

Lines 41-46 Link Here

(-)Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java (-4 / +8 lines)
41	*/	41	*/
42	public class DeferredTreeContentManager {	42	public class DeferredTreeContentManager {
43		43
		44	// RAP [if] display used to access NLS messages
		45	private final Display display;
		46
44	AbstractTreeViewer treeViewer;	47	AbstractTreeViewer treeViewer;
45		48
46	IWorkbenchSiteProgressService progressService;	49	IWorkbenchSiteProgressService progressService;
Lines 129-134 Link Here
129	*/	132	*/
130	public DeferredTreeContentManager(AbstractTreeViewer viewer) {	133	public DeferredTreeContentManager(AbstractTreeViewer viewer) {
131	treeViewer = viewer;	134	treeViewer = viewer;
		135	display = treeViewer.getControl().getDisplay();
132	}	136	}
133		137
134	/**	138	/**
Lines 145-151 Link Here
145	*/	149	*/
146	public boolean mayHaveChildren(Object element) {	150	public boolean mayHaveChildren(Object element) {
147	Assert.isNotNull(element,	151	Assert.isNotNull(element,
148	ProgressMessages.get().DeferredTreeContentManager_NotDeferred);	152	ProgressMessages.get( display ).DeferredTreeContentManager_NotDeferred);
149	IDeferredWorkbenchAdapter adapter = getAdapter(element);	153	IDeferredWorkbenchAdapter adapter = getAdapter(element);
150	return adapter != null && adapter.isContainer();	154	return adapter != null && adapter.isContainer();
151	}	155	}
Lines 316-322 Link Here
316	protected String getFetchJobName(Object parent,	320	protected String getFetchJobName(Object parent,
317	IDeferredWorkbenchAdapter adapter) {	321	IDeferredWorkbenchAdapter adapter) {
318	return NLS.bind(	322	return NLS.bind(
319	ProgressMessages.get().DeferredTreeContentManager_FetchingName,	323	ProgressMessages.get( display ).DeferredTreeContentManager_FetchingName,
320	adapter.getLabel(parent));	324	adapter.getLabel(parent));
321	}	325	}
322		326
Lines 330-336 Link Here
330	protected void addChildren(final Object parent, final Object[] children,	334	protected void addChildren(final Object parent, final Object[] children,
331	IProgressMonitor monitor) {	335	IProgressMonitor monitor) {
332	WorkbenchJob updateJob = new WorkbenchJob(	336	WorkbenchJob updateJob = new WorkbenchJob(
333	ProgressMessages.get().DeferredTreeContentManager_AddingChildren) {	337	ProgressMessages.get( display ).DeferredTreeContentManager_AddingChildren) {
334	/*	338	/*
335	* (non-Javadoc)	339	* (non-Javadoc)
336	*	340	*
Lines 382-388 Link Here
382		386
383	// Clear the placeholder if it is still there	387	// Clear the placeholder if it is still there
384	WorkbenchJob clearJob = new WorkbenchJob(	388	WorkbenchJob clearJob = new WorkbenchJob(
385	ProgressMessages.get().DeferredTreeContentManager_ClearJob) {	389	ProgressMessages.get( display ).DeferredTreeContentManager_ClearJob) {
386	/*	390	/*
387	* (non-Javadoc)	391	* (non-Javadoc)
388	*	392	*

Return to bug 364661