Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 278836 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse UI/org/eclipse/rap/ui/internal/progress/JobManagerAdapter.java (-5 / +22 lines)
Lines 71-86 Link Here
71
  // ProgressProvider
71
  // ProgressProvider
72
72
73
  public IProgressMonitor createMonitor( final Job job ) {
73
  public IProgressMonitor createMonitor( final Job job ) {
74
    ProgressManager manager = findProgressManager( job );
74
    IProgressMonitor result = null;
75
    return manager.createMonitor( job );
75
    ProgressManager manager = findSessionProgressManager( job );
76
    if( manager != null ) {
77
      result = manager.createMonitor( job );
78
    }
79
    return result;
76
  }
80
  }
77
81
78
  public IProgressMonitor createMonitor( final Job job,
82
  public IProgressMonitor createMonitor( final Job job,
79
                                         final IProgressMonitor group,
83
                                         final IProgressMonitor group,
80
                                         final int ticks )
84
                                         final int ticks )
81
  {
85
  {
82
    ProgressManager manager = findProgressManager( job );
86
    IProgressMonitor result = null;
83
    return manager.createMonitor( job, group, ticks );
87
    ProgressManager manager = findSessionProgressManager( job );
88
    if( manager != null ) {
89
      result = manager.createMonitor( job, group, ticks );
90
    }
91
    return result;
84
  }
92
  }
85
93
86
  public IProgressMonitor createProgressGroup() {
94
  public IProgressMonitor createProgressGroup() {
Lines 169-174 Link Here
169
  // helping methods
177
  // helping methods
170
178
171
  private ProgressManager findProgressManager( final Job job ) {
179
  private ProgressManager findProgressManager( final Job job ) {
180
    ProgressManager result = findSessionProgressManager( job );
181
    if( result == null ) {
182
      result = defaultProgressManager;
183
    }
184
    return result;
185
  }
186
187
188
  private ProgressManager findSessionProgressManager( final Job job ) {
172
    synchronized( lock ) {
189
    synchronized( lock ) {
173
      final ProgressManager result[] = new ProgressManager[ 1 ];
190
      final ProgressManager result[] = new ProgressManager[ 1 ];
174
      Display display = ( Display )jobs.get( job );
191
      Display display = ( Display )jobs.get( job );
Lines 183-189 Link Here
183
          throw new IllegalStateException( msg );
200
          throw new IllegalStateException( msg );
184
        }
201
        }
185
      } else {
202
      } else {
186
        result[ 0 ] = defaultProgressManager;
203
        result[ 0 ] = null;
187
      }
204
      }
188
      return result[ 0 ];
205
      return result[ 0 ];
189
    }
206
    }

Return to bug 278836