Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 208729 Details for
Bug 364661
In DeferredTreeContentManager - ProgressMessages.get() called out of UI Context
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Proposed patch.
Bug-364661.patch (text/plain), 3.58 KB, created by
Ivan Furnadjiev
on 2011-12-22 07:13:59 EST
(
hide
)
Description:
Proposed patch.
Filename:
MIME Type:
Creator:
Ivan Furnadjiev
Created:
2011-12-22 07:13:59 EST
Size:
3.58 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.ui.workbench >Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressMessages.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMessages.java,v >retrieving revision 1.3 >diff -u -r1.3 ProgressMessages.java >--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressMessages.java 28 Dec 2010 14:48:00 -0000 1.3 >+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressMessages.java 22 Dec 2011 12:09:49 -0000 >@@ -11,6 +11,8 @@ > package org.eclipse.ui.internal.progress; > > import org.eclipse.rwt.RWT; >+import org.eclipse.rwt.lifecycle.UICallBack; >+import org.eclipse.swt.widgets.Display; > > // RAP [fappel]: NLS needs to be session/request aware > //public class ProgressMessages extends NLS{ >@@ -138,4 +140,14 @@ > Object result = RWT.NLS.getISO8859_1Encoded( BUNDLE_NAME, clazz ); > return ( ProgressMessages )result; > } >+ >+ public static ProgressMessages get( Display display ) { >+ final ProgressMessages[] result = { null }; >+ UICallBack.runNonUIThreadWithFakeContext( display, new Runnable() { >+ public void run() { >+ result[ 0 ] = get(); >+ } >+ } ); >+ return result[ 0 ]; >+ } > } >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 22 Dec 2011 12:09:49 -0000 >@@ -41,6 +41,9 @@ > */ > public class DeferredTreeContentManager { > >+// RAP [if] display used to access NLS messages >+ private final Display display; >+ > AbstractTreeViewer treeViewer; > > IWorkbenchSiteProgressService progressService; >@@ -129,6 +132,7 @@ > */ > public DeferredTreeContentManager(AbstractTreeViewer viewer) { > treeViewer = viewer; >+ display = treeViewer.getControl().getDisplay(); > } > > /** >@@ -145,7 +149,7 @@ > */ > public boolean mayHaveChildren(Object element) { > Assert.isNotNull(element, >- ProgressMessages.get().DeferredTreeContentManager_NotDeferred); >+ ProgressMessages.get( display ).DeferredTreeContentManager_NotDeferred); > IDeferredWorkbenchAdapter adapter = getAdapter(element); > return adapter != null && adapter.isContainer(); > } >@@ -316,7 +320,7 @@ > protected String getFetchJobName(Object parent, > IDeferredWorkbenchAdapter adapter) { > return NLS.bind( >- ProgressMessages.get().DeferredTreeContentManager_FetchingName, >+ ProgressMessages.get( display ).DeferredTreeContentManager_FetchingName, > adapter.getLabel(parent)); > } > >@@ -330,7 +334,7 @@ > protected void addChildren(final Object parent, final Object[] children, > IProgressMonitor monitor) { > WorkbenchJob updateJob = new WorkbenchJob( >- ProgressMessages.get().DeferredTreeContentManager_AddingChildren) { >+ ProgressMessages.get( display ).DeferredTreeContentManager_AddingChildren) { > /* > * (non-Javadoc) > * >@@ -382,7 +386,7 @@ > > // Clear the placeholder if it is still there > WorkbenchJob clearJob = new WorkbenchJob( >- ProgressMessages.get().DeferredTreeContentManager_ClearJob) { >+ ProgressMessages.get( display ).DeferredTreeContentManager_ClearJob) { > /* > * (non-Javadoc) > *
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 364661
:
207450
| 208729 |
237599