Attachment 147317 Details for Bug 278836 – Bugfix

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

[patch] Bugfix

clipboard.txt (text/plain), 2.30 KB, created by Rüdiger Herrmann

on 2009-09-16 10:22:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-09-16 10:22:38 EDT

Size: 2.30 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/rap/ui/internal/progress/JobManagerAdapter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/rap/ui/internal/progress/JobManagerAdapter.java,v
>retrieving revision 1.3
>diff -u -r1.3 JobManagerAdapter.java
>--- Eclipse UI/org/eclipse/rap/ui/internal/progress/JobManagerAdapter.java	16 Sep 2009 10:02:53 -0000	1.3
>+++ Eclipse UI/org/eclipse/rap/ui/internal/progress/JobManagerAdapter.java	16 Sep 2009 14:24:35 -0000
>@@ -71,16 +71,24 @@
>   // ProgressProvider
> 
>   public IProgressMonitor createMonitor( final Job job ) {
>-    ProgressManager manager = findProgressManager( job );
>-    return manager.createMonitor( job );
>+    IProgressMonitor result = null;
>+    ProgressManager manager = findSessionProgressManager( job );
>+    if( manager != null ) {
>+      result = manager.createMonitor( job );
>+    }
>+    return result;
>   }
> 
>   public IProgressMonitor createMonitor( final Job job,
>                                          final IProgressMonitor group,
>                                          final int ticks )
>   {
>-    ProgressManager manager = findProgressManager( job );
>-    return manager.createMonitor( job, group, ticks );
>+    IProgressMonitor result = null;
>+    ProgressManager manager = findSessionProgressManager( job );
>+    if( manager != null ) {
>+      result = manager.createMonitor( job, group, ticks );
>+    }
>+    return result;
>   }
> 
>   public IProgressMonitor createProgressGroup() {
>@@ -169,6 +177,15 @@
>   // helping methods
> 
>   private ProgressManager findProgressManager( final Job job ) {
>+    ProgressManager result = findSessionProgressManager( job );
>+    if( result == null ) {
>+      result = defaultProgressManager;
>+    }
>+    return result;
>+  }
>+
>+
>+  private ProgressManager findSessionProgressManager( final Job job ) {
>     synchronized( lock ) {
>       final ProgressManager result[] = new ProgressManager[ 1 ];
>       Display display = ( Display )jobs.get( job );
>@@ -183,7 +200,7 @@
>           throw new IllegalStateException( msg );
>         }
>       } else {
>-        result[ 0 ] = defaultProgressManager;
>+        result[ 0 ] = null;
>       }
>       return result[ 0 ];
>     }

Actions: View | Diff

Attachments on bug 278836: 138285 | 147309 | 147317