Attachment 207450 Details for Bug 364661 – Patch

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

[patch] Patch

DTCM.patch (text/plain), 2.46 KB, created by Imrich Schindler

on 2011-11-23 17:36:02 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Imrich Schindler

Created: 2011-11-23 17:36:02 EST

Size: 2.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java,v
>retrieving revision 1.4
>diff -u -r1.4 DeferredTreeContentManager.java
>--- Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java	28 Dec 2010 14:47:59 -0000	1.4
>+++ Eclipse UI/org/eclipse/ui/progress/DeferredTreeContentManager.java	23 Nov 2011 22:31:23 -0000
>@@ -44,6 +44,11 @@
> 	AbstractTreeViewer treeViewer;
> 
> 	IWorkbenchSiteProgressService progressService;
>+	
>+	protected String pm_AddingChildren =  ProgressMessages.get().DeferredTreeContentManager_AddingChildren;
>+	protected String pm_NotDeferred =  ProgressMessages.get().DeferredTreeContentManager_NotDeferred;
>+	protected String pm_FetchingName = ProgressMessages.get().DeferredTreeContentManager_FetchingName;
>+	protected String pm_ClearJob = ProgressMessages.get().DeferredTreeContentManager_ClearJob;
> 
> 	private ListenerList updateCompleteListenerList;
> 
>@@ -144,8 +149,7 @@
> 	 *             if the element is null.
> 	 */
> 	public boolean mayHaveChildren(Object element) {
>-		Assert.isNotNull(element,
>-				ProgressMessages.get().DeferredTreeContentManager_NotDeferred);
>+		Assert.isNotNull(element,	pm_NotDeferred);
> 		IDeferredWorkbenchAdapter adapter = getAdapter(element);
> 		return adapter != null && adapter.isContainer();
> 	}
>@@ -315,9 +319,7 @@
> 	 */
> 	protected String getFetchJobName(Object parent,
> 			IDeferredWorkbenchAdapter adapter) {
>-		return NLS.bind(
>-				ProgressMessages.get().DeferredTreeContentManager_FetchingName,
>-				adapter.getLabel(parent));
>+		return NLS.bind(pm_FetchingName, adapter.getLabel(parent));
> 	}
> 
> 	/**
>@@ -329,8 +331,7 @@
> 	 */
> 	protected void addChildren(final Object parent, final Object[] children,
> 			IProgressMonitor monitor) {
>-		WorkbenchJob updateJob = new WorkbenchJob(
>-				ProgressMessages.get().DeferredTreeContentManager_AddingChildren) {
>+		WorkbenchJob updateJob = new WorkbenchJob(pm_AddingChildren) {
> 			/*
> 			 * (non-Javadoc)
> 			 * 
>@@ -381,8 +382,7 @@
> 		}
> 
> 		// Clear the placeholder if it is still there
>-		WorkbenchJob clearJob = new WorkbenchJob(
>-				ProgressMessages.get().DeferredTreeContentManager_ClearJob) {
>+		WorkbenchJob clearJob = new WorkbenchJob(display, pm_ClearJob) {
> 			/*
> 			 * (non-Javadoc)
> 			 *

Actions: View | Diff

Attachments on bug 364661: 207450 | 208729 | 237599